diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-06-27 18:52:08 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-06-27 18:52:08 -0700 |
| commit | 66a6f96e7be69c7788ad4be47177318742ca2eca (patch) | |
| tree | 0427695347d55f3e26fc553d4c933db0c65f701e | |
| parent | de86893bf5692743983420bad1a3b37fbb8dbdd2 (diff) | |
| parent | 2eb008a6e3579f2b1d0d9f28a6ea681966f9c7d7 (diff) | |
| download | syslinux-66a6f96e7be69c7788ad4be47177318742ca2eca.tar.gz | |
Merge branch 'master' into lwip
| -rw-r--r-- | com32/lib/pci/scan.c | 7 | ||||
| -rw-r--r-- | com32/lib/syslinux/load_linux.c | 11 | ||||
| -rw-r--r-- | com32/lib/syslinux/movebits.c | 16 | ||||
| -rw-r--r-- | com32/lib/syslinux/zonelist.c | 16 | ||||
| -rw-r--r-- | com32/modules/ethersel.c | 7 | ||||
| -rw-r--r-- | com32/modules/pcitest.c | 7 |
6 files changed, 6 insertions, 58 deletions
diff --git a/com32/lib/pci/scan.c b/com32/lib/pci/scan.c index 4e5635f6..e0974f98 100644 --- a/com32/lib/pci/scan.c +++ b/com32/lib/pci/scan.c @@ -41,12 +41,7 @@ #include <stdbool.h> #include <ctype.h> #include <syslinux/zio.h> - -#ifdef DEBUG -# define dprintf printf -#else -# define dprintf(...) ((void)0) -#endif +#include <dprintf.h> #define MAX_LINE 512 diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c index c1ce875c..4b60a231 100644 --- a/com32/lib/syslinux/load_linux.c +++ b/com32/lib/syslinux/load_linux.c @@ -43,16 +43,7 @@ #include <syslinux/linux.h> #include <syslinux/bootrm.h> #include <syslinux/movebits.h> - -#ifndef DEBUG -# define DEBUG 0 -#endif -#if DEBUG -# include <stdio.h> -# define dprintf printf -#else -# define dprintf(f, ...) ((void)0) -#endif +#include <dprintf.h> struct linux_header { uint8_t boot_sector_1[0x0020]; diff --git a/com32/lib/syslinux/movebits.c b/com32/lib/syslinux/movebits.c index bd5ce0e8..6c75105a 100644 --- a/com32/lib/syslinux/movebits.c +++ b/com32/lib/syslinux/movebits.c @@ -48,21 +48,7 @@ #include <stdbool.h> #include <syslinux/movebits.h> - -#ifndef DEBUG -# ifdef TEST -# define DEBUG 1 -# else -# define DEBUG 0 -# endif -#endif - -#if DEBUG -# include <stdio.h> -# define dprintf printf -#else -# define dprintf(...) ((void)0) -#endif +#include <dprintf.h> static jmp_buf new_movelist_bail; diff --git a/com32/lib/syslinux/zonelist.c b/com32/lib/syslinux/zonelist.c index b548211f..915c7a8c 100644 --- a/com32/lib/syslinux/zonelist.c +++ b/com32/lib/syslinux/zonelist.c @@ -39,21 +39,7 @@ #include <stdlib.h> #include <syslinux/align.h> #include <syslinux/movebits.h> - -#ifndef DEBUG -# ifdef TEST -# define DEBUG 1 -# else -# define DEBUG 0 -# endif -#endif - -#if DEBUG -# include <stdio.h> -# define dprintf printf -#else -# define dprintf(...) ((void)0) -#endif +#include <dprintf.h> /* * Create an empty syslinux_memmap list. diff --git a/com32/modules/ethersel.c b/com32/modules/ethersel.c index 5c3cf02a..28dc62ca 100644 --- a/com32/modules/ethersel.c +++ b/com32/modules/ethersel.c @@ -38,12 +38,7 @@ #include <com32.h> #include <syslinux/boot.h> #include <syslinux/config.h> - -#ifdef DEBUG -# define dprintf printf -#else -# define dprintf(...) ((void)0) -#endif +#include <dprintf.h> #define MAX_LINE 512 diff --git a/com32/modules/pcitest.c b/com32/modules/pcitest.c index 672023ad..9921ee6d 100644 --- a/com32/modules/pcitest.c +++ b/com32/modules/pcitest.c @@ -39,12 +39,7 @@ #include <com32.h> #include <sys/pci.h> #include <stdbool.h> - -#ifdef DEBUG -# define dprintf printf -#else -# define dprintf(...) ((void)0) -#endif +#include <dprintf.h> char display_line = 0; #define moreprintf(...) \ |