Changeset 03362fbd in mainline for uspace/lib/posix/source/stdio.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/lib/posix/source/stdio.c (moved) (moved from uspace/lib/posix/stdio.c ) (2 diffs)

uspace/lib/posix/source/stdio.c

@@ -36 +36 @@
 #define LIBPOSIX_INTERNAL
 
-/* Has to be first. */
-#include "stdbool.h"
-
 #include "internal/common.h"
-#include "stdio.h"
-
-#include "assert.h"
-#include "errno.h"
-#include "stdlib.h"
-#include "string.h"
-#include "sys/types.h"
-#include "unistd.h"
-
+#include "posix/stdio.h"
+
+#include "posix/assert.h"
+#include "posix/errno.h"
+#include "posix/stdlib.h"
+#include "posix/string.h"
+#include "posix/sys/types.h"
+#include "posix/unistd.h"
+
+#include "libc/stdio.h"
 #include "libc/io/printf_core.h"
+#include "libc/stdbool.h"
 #include "libc/str.h"
 #include "libc/malloc.h"
@@ -59 +58 @@
  * need to be implemented in libc anyway
  */
-#include "../c/generic/private/stdio.h"
+#include "../../c/generic/private/stdio.h"
 
 /** Clears the stream's error and end-of-file indicators.