Changeset 03362fbd in mainline for uspace/lib/posix/source/stdio/scanf.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/scanf.c (moved) (moved from uspace/lib/posix/stdio/scanf.c ) (1 diff)

uspace/lib/posix/source/stdio/scanf.c

@@ -35 +35 @@
 #define LIBPOSIX_INTERNAL
 
-/* Must be first. */
-#include "../stdbool.h"
-
-#include "../assert.h"
-#include "../errno.h"
-
-#include "../stdio.h"
-#include "../stdlib.h"
-#include "../stddef.h"
-#include "../string.h"
-#include "../ctype.h"
-#include "../sys/types.h"
+#include "posix/assert.h"
+#include "posix/errno.h"
+
+#include "posix/stdio.h"
+#include "posix/stdlib.h"
+#include "posix/stddef.h"
+#include "posix/string.h"
+#include "posix/ctype.h"
+#include "posix/sys/types.h"
 
 #include "../internal/common.h"
-#include "../libc/malloc.h"
+#include "libc/malloc.h"
+#include "libc/stdbool.h"
 
 /** Unified data type for possible data sources for scanf. */