[syslinux:elflink] dprintf: Always include the dprintf implementation in libcom32core.a

syslinux-bot for Matt Fleming matt.fleming at intel.com
Thu Jul 19 08:48:03 PDT 2012


Commit-ID:  5f17528b5ff4e35911794d20759f5a72f0f4f3bd
Gitweb:     http://www.syslinux.org/commit/5f17528b5ff4e35911794d20759f5a72f0f4f3bd
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Mon, 2 Jul 2012 14:02:35 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Mon, 2 Jul 2012 14:02:35 +0100

dprintf: Always include the dprintf implementation in libcom32core.a

Whether or not we compile the com32/ code with DEBUG=1 we need to
provide the dprintf() implementation. This was highlighted by commit
72842b681e7b ("SEG(): make SEG() puke on bad pointers if DEBUG is
defined")

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 com32/lib/dprintf.c  |    5 ++---
 com32/lib/vdprintf.c |    6 ------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/com32/lib/dprintf.c b/com32/lib/dprintf.c
index 4d80204..d22dae9 100644
--- a/com32/lib/dprintf.c
+++ b/com32/lib/dprintf.c
@@ -4,9 +4,9 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <dprintf.h>
 
-#ifndef dprintf
+void vdprintf(const char *, va_list);
+
 void dprintf(const char *format, ...)
 {
     va_list ap;
@@ -15,4 +15,3 @@ void dprintf(const char *format, ...)
     vdprintf(format, ap);
     va_end(ap);
 }
-#endif
diff --git a/com32/lib/vdprintf.c b/com32/lib/vdprintf.c
index a48f2eb..77e8da4 100644
--- a/com32/lib/vdprintf.c
+++ b/com32/lib/vdprintf.c
@@ -10,10 +10,6 @@
 #include <sys/io.h>
 #include <sys/cpu.h>
 
-#include <dprintf.h>
-
-#ifndef vdprintf
-
 #define BUFFER_SIZE	4096
 
 enum serial_port_regs {
@@ -114,5 +110,3 @@ void vdprintf(const char *format, va_list ap)
     while (rv--)
 	debug_putc(*p++);
 }
-
-#endif /* vdprintf */


More information about the Syslinux-commits mailing list