diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-01 18:04:13 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-01 18:04:13 -0700 |
| commit | 26bbd3b34e615619b03d669d68b319993d2d42fe (patch) | |
| tree | 628b11ce49a69e641a939bf969fa58332065477f | |
| parent | d6799b6b04f50c6b67358f7afbcd46912fdca83a (diff) | |
| download | syslinux-26bbd3b34e615619b03d669d68b319993d2d42fe.tar.gz | |
com32: canonicalize DEBUG to mean <dprintf.h>
Remove historical uses of DEBUG/dprintf in favor of the centralized
<dprintf.h>.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | com32/hdt/hdt-cli.h | 8 | ||||
| -rw-r--r-- | com32/modules/elf.c | 8 | ||||
| -rw-r--r-- | com32/modules/pmload.c | 8 | ||||
| -rw-r--r-- | com32/modules/sdi.c | 8 |
4 files changed, 4 insertions, 28 deletions
diff --git a/com32/hdt/hdt-cli.h b/com32/hdt/hdt-cli.h index d9632b2d..98246b4d 100644 --- a/com32/hdt/hdt-cli.h +++ b/com32/hdt/hdt-cli.h @@ -30,16 +30,10 @@ #define DEFINE_HDT_CLI_H #include <stdio.h> #include <getkey.h> +#include <dprintf.h> #include "hdt-common.h" -#define DEBUG 0 -#if DEBUG -# define dprintf printf -#else -# define dprintf(f, ...) ((void)0) -#endif - #define MAX_LINE_SIZE 256 #define CLI_SPACE " " diff --git a/com32/modules/elf.c b/com32/modules/elf.c index d53d936c..182afa60 100644 --- a/com32/modules/elf.c +++ b/com32/modules/elf.c @@ -42,6 +42,7 @@ #include <sys/stat.h> #include <elf.h> #include <console.h> +#include <dprintf.h> #include <syslinux/loadfile.h> #include <syslinux/movebits.h> @@ -50,13 +51,6 @@ /* If we don't have this much memory for the stack, signal failure */ #define MIN_STACK 512 -#define DEBUG 0 -#if DEBUG -# define dprintf printf -#else -# define dprintf(f, ...) ((void)0) -#endif - static inline void error(const char *msg) { fputs(msg, stderr); diff --git a/com32/modules/pmload.c b/com32/modules/pmload.c index 7a0e193f..3064a94f 100644 --- a/com32/modules/pmload.c +++ b/com32/modules/pmload.c @@ -44,6 +44,7 @@ #include <sys/stat.h> #include <elf.h> #include <console.h> +#include <dprintf.h> #include <syslinux/loadfile.h> #include <syslinux/movebits.h> @@ -52,13 +53,6 @@ /* If we don't have this much memory for the stack, signal failure */ #define MIN_STACK 512 -#define DEBUG 0 -#if DEBUG -# define dprintf printf -#else -# define dprintf(f, ...) ((void)0) -#endif - static inline void error(const char *msg) { fputs(msg, stderr); diff --git a/com32/modules/sdi.c b/com32/modules/sdi.c index fbca6a55..69841d20 100644 --- a/com32/modules/sdi.c +++ b/com32/modules/sdi.c @@ -28,18 +28,12 @@ #include <minmax.h> #include <sys/stat.h> #include <console.h> +#include <dprintf.h> #include <syslinux/loadfile.h> #include <syslinux/movebits.h> #include <syslinux/bootrm.h> -#define DEBUG 0 -#if DEBUG -# define dprintf printf -#else -# define dprintf(f, ...) ((void)0) -#endif - typedef uint8_t guid_t[16]; struct SDIHeader { |