From: Blue_Dude <Blue_Dude@a1c6a512-1295-4272-9138-f99709370657>
Date: Sat, 15 May 2010 03:47:06 +0000 (+0000)
Subject: vuprintf does not belong in stdio.h, causes problems with other versions of stdio.h
X-Git-Url: https://repo.or.cz/w/kugel-rb.git/commitdiff_plain/32f3b2dc439ed333fad9234df5dacf85e1d81c61

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
---

diff --git a/firmware/libc/include/stdio.h b/firmware/libc/include/stdio.h
index d9a6dce55..14f531fad 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);
 int snprintf (char *buf, size_t size, const char *fmt, ...)
               ATTRIBUTE_PRINTF(3, 4);
 
-/* callback function is called for every output character (byte) with userp and
- * should return 0 when ch is a char other than '\0' that should stop printing */
-int vuprintf(int (*push)(void *userp, unsigned char data),
-              void *userp, const char *fmt, __VALIST ap);
-
 int sscanf(const char *s, const char *fmt, ...)
     ATTRIBUTE_SCANF(2, 3);
 
diff --git a/firmware/logf.c b/firmware/logf.c
index b68f8a1d2..6bdda3f42 100644
--- a/firmware/logf.c
+++ b/firmware/logf.c
@@ -35,6 +35,7 @@
 #include "lcd-remote.h"
 #include "logf.h"
 #include "serial.h"
+#include "format.h"
 
 #ifdef HAVE_USBSTACK
 #include "usb_core.h"
diff --git a/firmware/target/arm/s3c2440/uart-s3c2440.c b/firmware/target/arm/s3c2440/uart-s3c2440.c
index 829eb0527..8fe651125 100644
--- a/firmware/target/arm/s3c2440/uart-s3c2440.c
+++ b/firmware/target/arm/s3c2440/uart-s3c2440.c
@@ -29,6 +29,7 @@
 #include "system.h"
 #include "kernel.h"
 #include "thread.h"
+#include "format.h"
 
 #include "system-target.h"
 #include "uart-s3c2440.h"