Changeset 04803bf in mainline for kernel/generic/include/printf/printf_core.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/generic/include/printf/printf_core.h (modified) (2 diffs)

kernel/generic/include/printf/printf_core.h

@@ -37 +37 @@
 
 #include <typedefs.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 /** Structure for specifying output methods for different printf clones. */
@@ -51 +51 @@
 } printf_spec_t;
 
-int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
+extern int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
 
 #endif