Changeset b0f00a9 in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2011-11-06T22:21:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/generic/libc.c (modified) (3 diffs)

uspace/lib/c/generic/libc.c

@@ -49 +49 @@
 #include "private/libc.h"
 #include "private/async.h"
-#include "private/async_sess.h"
 #include "private/malloc.h"
 #include "private/io.h"
@@ -64 +63 @@
         __malloc_init();
         __async_init();
-        __async_sess_init();
         
         fibril_t *fibril = fibril_setup();
@@ -93 +91 @@
                 argc = 0;
                 argv = NULL;
-                __stdio_init(0, NULL);
+                __stdio_init(0);
         } else {
                 argc = __pcb->argc;
                 argv = __pcb->argv;
-                __stdio_init(__pcb->filc, __pcb->filv);
+                __stdio_init(__pcb->filc);
                 (void) chdir(__pcb->cwd);
         }