diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-07-02 14:02:35 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-07-02 14:02:35 +0100 |
| commit | 5f17528b5ff4e35911794d20759f5a72f0f4f3bd (patch) | |
| tree | d7a34b114f2b1ab17b3eb660034002cf0c529fdb | |
| parent | 4ecc2eee96ca522e0cd4f00d2d27e3f2df90bc08 (diff) | |
| download | syslinux-5f17528b5ff4e35911794d20759f5a72f0f4f3bd.tar.gz syslinux-5f17528b5ff4e35911794d20759f5a72f0f4f3bd.tar.xz syslinux-5f17528b5ff4e35911794d20759f5a72f0f4f3bd.zip | |
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@intel.com>
| -rw-r--r-- | com32/lib/dprintf.c | 5 | ||||
| -rw-r--r-- | 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 4d80204c..d22dae95 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 a48f2ebc..77e8da42 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 */ |