From 17f2560ce690d6ed2cb75d2442e3225a10f27d9c Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 8 Sep 2004 02:48:27 +0000 Subject: [PATCH] r2248: Merge of tridge's PRINTF_ATTRIBUTE fixes from samba4. (This used to be commit 53bfb76608efa347d5fe154c5583a5e8e3d53740) --- source3/include/includes.h | 5 +++-- source3/tdb/tdb.h | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/source3/include/includes.h b/source3/include/includes.h index 56624e5198c..58cb39790f2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -45,10 +45,11 @@ #undef HAVE_TERMIOS_H #endif -#ifdef __GNUC__ +#if (__GNUC__ >= 3) /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first - * argument. **/ + * argument. Note that some gcc 2.x versions don't handle this + * properly **/ #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) #else #define PRINTF_ATTRIBUTE(a1, a2) diff --git a/source3/tdb/tdb.h b/source3/tdb/tdb.h index 3db676a633f..e8a6d201c59 100644 --- a/source3/tdb/tdb.h +++ b/source3/tdb/tdb.h @@ -32,7 +32,15 @@ extern "C" { #endif #ifndef PRINTF_ATTRIBUTE +/** Use gcc attribute to check printf fns. a1 is the 1-based index of + * the parameter containing the format, and a2 the index of the first + * argument. Note that some gcc 2.x versions don't handle this + * properly **/ +#if (__GNUC__ >= 3) #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) +#else +#define PRINTF_ATTRIBUTE(a1, a2) +#endif #endif /* flags to tdb_store() */ -- 2.11.4.GIT