summaryrefslogtreecommitdiffstats
path: root/include/stdio.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/stdio.h')
-rw-r--r--include/stdio.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/include/stdio.h b/include/stdio.h
index 1cb11e88de..b6ded805cc 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -4,6 +4,7 @@
#include <stdarg.h>
#include <console.h>
+#include <printk.h>
/*
* STDIO based functions (can always be used)
@@ -59,20 +60,18 @@ static inline int vprintf(const char *fmt, va_list args)
return 0;
}
-#ifndef ARCH_HAS_CTRLC
+#ifndef CONFIG_ARCH_HAS_CTRLC
/* test if ctrl-c was pressed */
static inline int ctrlc (void)
{
return 0;
}
-#endif /* ARCH_HAS_CTRLC */
+#endif /* CONFIG_ARCH_HAS_CTRLC */
#endif
#if (!defined(__PBL__) && !defined(CONFIG_CONSOLE_NONE)) || \
(defined(__PBL__) && defined(CONFIG_PBL_CONSOLE))
-int printf(const char *fmt, ...) __attribute__ ((format(__printf__, 1, 2)));
-
static inline int puts(const char *s)
{
return console_puts(CONSOLE_STDOUT, s);
@@ -83,11 +82,6 @@ static inline void putchar(char c)
console_putc(CONSOLE_STDOUT, c);
}
#else
-static int printf(const char *fmt, ...) __attribute__ ((format(__printf__, 1, 2)));
-static inline int printf(const char *fmt, ...)
-{
- return 0;
-}
static inline int puts(const char *s)
{
return 0;