diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-15 03:47:06 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-15 03:47:06 +0000 |
commit | b8a51adb5736e9daf335fcf0015ce99d734bcdca (patch) | |
tree | e4adfcef5ab2e42229979bfd46d1e9eb6da6c286 | |
parent | f2a56161f7a7bcb65881f621ce8627cc3626c0bc (diff) | |
download | rockbox-b8a51adb5736e9daf335fcf0015ce99d734bcdca.tar.gz rockbox-b8a51adb5736e9daf335fcf0015ce99d734bcdca.zip |
vuprintf does not belong in stdio.h, causes problems with other versions of stdio.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26042 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/libc/include/stdio.h | 5 | ||||
-rw-r--r-- | firmware/logf.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/uart-s3c2440.c | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/firmware/libc/include/stdio.h b/firmware/libc/include/stdio.h index d9a6dce55f..14f531fad1 100644 --- a/firmware/libc/include/stdio.h +++ b/firmware/libc/include/stdio.h | |||
@@ -40,11 +40,6 @@ int sprintf (char *buf, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); | |||
40 | int snprintf (char *buf, size_t size, const char *fmt, ...) | 40 | int snprintf (char *buf, size_t size, const char *fmt, ...) |
41 | ATTRIBUTE_PRINTF(3, 4); | 41 | ATTRIBUTE_PRINTF(3, 4); |
42 | 42 | ||
43 | /* callback function is called for every output character (byte) with userp and | ||
44 | * should return 0 when ch is a char other than '\0' that should stop printing */ | ||
45 | int vuprintf(int (*push)(void *userp, unsigned char data), | ||
46 | void *userp, const char *fmt, __VALIST ap); | ||
47 | |||
48 | int sscanf(const char *s, const char *fmt, ...) | 43 | int sscanf(const char *s, const char *fmt, ...) |
49 | ATTRIBUTE_SCANF(2, 3); | 44 | ATTRIBUTE_SCANF(2, 3); |
50 | 45 | ||
diff --git a/firmware/logf.c b/firmware/logf.c index b68f8a1d26..6bdda3f424 100644 --- a/firmware/logf.c +++ b/firmware/logf.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include "lcd-remote.h" | 35 | #include "lcd-remote.h" |
36 | #include "logf.h" | 36 | #include "logf.h" |
37 | #include "serial.h" | 37 | #include "serial.h" |
38 | #include "format.h" | ||
38 | 39 | ||
39 | #ifdef HAVE_USBSTACK | 40 | #ifdef HAVE_USBSTACK |
40 | #include "usb_core.h" | 41 | #include "usb_core.h" |
diff --git a/firmware/target/arm/s3c2440/uart-s3c2440.c b/firmware/target/arm/s3c2440/uart-s3c2440.c index 829eb05270..8fe6511253 100644 --- a/firmware/target/arm/s3c2440/uart-s3c2440.c +++ b/firmware/target/arm/s3c2440/uart-s3c2440.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "system.h" | 29 | #include "system.h" |
30 | #include "kernel.h" | 30 | #include "kernel.h" |
31 | #include "thread.h" | 31 | #include "thread.h" |
32 | #include "format.h" | ||
32 | 33 | ||
33 | #include "system-target.h" | 34 | #include "system-target.h" |
34 | #include "uart-s3c2440.h" | 35 | #include "uart-s3c2440.h" |