Browse Source

Fix talloc's use of PRINTF_ATTRIBUTE clash.

Rusty Russell 18 years ago
parent
commit
246bde098d
1 changed files with 2 additions and 0 deletions
  1. 2 0
      ccan_tools/libtap/src/tap.h

+ 2 - 0
ccan_tools/libtap/src/tap.h

@@ -54,11 +54,13 @@
 
 
 # define skip_end } while(0)
 # define skip_end } while(0)
 
 
+#ifndef PRINTF_ATTRIBUTE
 #ifdef __GNUC__
 #ifdef __GNUC__
 #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
 #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
 #else
 #else
 #define PRINTF_ATTRIBUTE(a1, a2)
 #define PRINTF_ATTRIBUTE(a1, a2)
 #endif
 #endif
+#endif
 
 
 unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...)
 unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...)
 	PRINTF_ATTRIBUTE(5, 6);
 	PRINTF_ATTRIBUTE(5, 6);