Use __printf__ in gcc function attributes to avoid clash with libc wrapper

    define, and remove the last bits of the old workaround.

1 files changed, 1 insertions, 6 deletions

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);