Changeset 371bd7d in mainline for kernel/generic/src/printf

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Location:

kernel/generic/src/printf

Files:

• printf_core.c (modified) (1 diff)
• vprintf.c (modified) (1 diff)
• vsnprintf.c (modified) (1 diff)

kernel/generic/src/printf/printf_core.c

@@ -41 +41 @@
 #include <stdarg.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>
 

kernel/generic/src/printf/vprintf.c

@@ -38 +38 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
-#include <arch/types.h>
 #include <typedefs.h>
-#include <string.h>
+#include <typedefs.h>
+#include <str.h>
 
 SPINLOCK_STATIC_INITIALIZE_NAME(printf_lock, "*printf_lock");

kernel/generic/src/printf/vsnprintf.c

@@ -35 +35 @@
 #include <print.h>
 #include <printf/printf_core.h>
-#include <string.h>
+#include <str.h>
 #include <memstr.h>
 #include <errno.h>