From: Rusty Russell Date: Thu, 28 Feb 2008 03:08:21 +0000 (+1100) Subject: Fix talloc's use of PRINTF_ATTRIBUTE clash. X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=246bde098d4f5ac212840a41b740297dd94e1135 Fix talloc's use of PRINTF_ATTRIBUTE clash. --- diff --git a/ccan_tools/libtap/src/tap.h b/ccan_tools/libtap/src/tap.h index 4a8b346f..9a14c696 100644 --- a/ccan_tools/libtap/src/tap.h +++ b/ccan_tools/libtap/src/tap.h @@ -54,11 +54,13 @@ # define skip_end } while(0) +#ifndef PRINTF_ATTRIBUTE #ifdef __GNUC__ #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) #else #define PRINTF_ATTRIBUTE(a1, a2) #endif +#endif unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...) PRINTF_ATTRIBUTE(5, 6);