Revert "On some systems printf is a macro"

This reverts commit bc5b600458.
This commit is contained in:
malc 2010-02-08 12:04:56 +03:00
parent d55380bb9c
commit 3f020d7024
3 changed files with 48 additions and 52 deletions

View File

@ -58,7 +58,7 @@ static void format_print(void *opaque, const char *name)
/* Please keep in synch with qemu-img.texi */ /* Please keep in synch with qemu-img.texi */
static void help(void) static void help(void)
{ {
(printf)("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice Bellard\n" printf("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice Bellard\n"
"usage: qemu-img command [command options]\n" "usage: qemu-img command [command options]\n"
"QEMU disk image utility\n" "QEMU disk image utility\n"
"\n" "\n"

View File

@ -28,10 +28,6 @@
#define IS_ESC 1 #define IS_ESC 1
#define IS_CSI 2 #define IS_CSI 2
#ifdef printf
#undef printf
#endif
#define printf do_not_use_printf #define printf do_not_use_printf
void readline_show_prompt(ReadLineState *rs) void readline_show_prompt(ReadLineState *rs)

2
vl.c
View File

@ -4022,7 +4022,7 @@ static void version(void)
static void help(int exitcode) static void help(int exitcode)
{ {
version(); version();
(printf)("usage: %s [options] [disk_image]\n" printf("usage: %s [options] [disk_image]\n"
"\n" "\n"
"'disk_image' is a raw hard image image for IDE hard disk 0\n" "'disk_image' is a raw hard image image for IDE hard disk 0\n"
"\n" "\n"