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

Timestamp:

2011-01-05T19:08:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f03d3786

Parents:

e84d65a (diff), 196ef08 (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

Conflicts: no problem solving.
Added new apps to ignore list.

File:

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

uspace/lib/c/generic/libc.c

@@ -50 +50 @@
 #include <ipc/ipc.h>
 #include <async.h>
-#include <async_rel.h>
 #include <as.h>
 #include <loader/pcb.h>
@@ -66 +65 @@
         __heap_init();
         __async_init();
-        (void) async_rel_init();
         fibril_t *fibril = fibril_setup();
         __tcb_set(fibril->tcb);