diff options
| -rw-r--r-- | hw/xfree86/common/xf86.h | 5 | ||||
| -rw-r--r-- | include/os.h | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 026b45852..1885eaa72 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -226,11 +226,6 @@ void xf86ProcessActionEvent(ActionEvent action, void *arg); /* xf86Helper.c */ -#ifdef printf -#define printf_defined -#undef printf -#endif - void xf86AddDriver(DriverPtr driver, pointer module, int flags); void xf86DeleteDriver(int drvIndex); ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags); diff --git a/include/os.h b/include/os.h index 6e8602577..34337ce6a 100644 --- a/include/os.h +++ b/include/os.h @@ -502,16 +502,11 @@ typedef enum { /* XXX Need to check which GCC versions have the format(printf) attribute. */ #if defined(__GNUC__) && \ ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4))) -#define _printf_attribute(a,b) __attribute((format(printf,a,b))) +#define _printf_attribute(a,b) __attribute((format(__printf__,a,b))) #else #define _printf_attribute(a,b) /**/ #endif -#ifdef printf -#define printf_defined -#undef printf -#endif - extern const char *LogInit(const char *fname, const char *backup); extern void LogClose(void); extern Bool LogSetParameter(LogParameter param, int value); |