diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-29 20:45:23 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-29 20:45:23 +0100 |
| commit | e0f4fb2c982d66210dfd5ffaf92912bf1c6c6586 (patch) | |
| tree | 6095eff90c4f335e47dc2454be6edc671dfe5e1b /include | |
| parent | 97e0b488a94c6f8c9bac5100b0f8542264d555be (diff) | |
| parent | 6fa8c93a5ecefe4effa0e0425441a8ff6b2ce6ab (diff) | |
| download | barebox-e0f4fb2c982d66210dfd5ffaf92912bf1c6c6586.tar.gz barebox-e0f4fb2c982d66210dfd5ffaf92912bf1c6c6586.tar.xz | |
Merge branch 'master' into next
Conflicts:
drivers/ata/disk_drive.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/stdio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/stdio.h b/include/stdio.h index a0d81d3b74..4901bc7182 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -17,12 +17,12 @@ int tstc(void); /* stdout */ void console_putc(unsigned int ch, const char c); int getc(void); -void console_puts(unsigned int ch, const char *s); +int console_puts(unsigned int ch, const char *s); void console_flush(void); -static inline void puts(const char *s) +static inline int puts(const char *s) { - console_puts(CONSOLE_STDOUT, s); + return console_puts(CONSOLE_STDOUT, s); } static inline void putchar(char c) @@ -54,7 +54,7 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); #define stderr 2 #define MAX_FILES 128 -void fprintf(int file, const char *fmt, ...) __attribute__ ((format(__printf__, 2, 3))); +int fprintf(int file, const char *fmt, ...) __attribute__ ((format(__printf__, 2, 3))); int fputs(int file, const char *s); int fputc(int file, const char c); int ftstc(int file); |