diff options
| author | Tim Potter <tpot@samba.org> | 2004-09-08 02:48:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:37 -0500 |
| commit | 17f2560ce690d6ed2cb75d2442e3225a10f27d9c (patch) | |
| tree | 2dfcc3f3a9fa3f249657c93a88d88cd0b6a62419 | |
| parent | fc84e916f628b4fb6f6667ad45d0ced0e9134b23 (diff) | |
| download | samba-17f2560ce690d6ed2cb75d2442e3225a10f27d9c.tar.gz samba-17f2560ce690d6ed2cb75d2442e3225a10f27d9c.tar.bz2 samba-17f2560ce690d6ed2cb75d2442e3225a10f27d9c.zip | |
r2248: Merge of tridge's PRINTF_ATTRIBUTE fixes from samba4.
(This used to be commit 53bfb76608efa347d5fe154c5583a5e8e3d53740)
| -rw-r--r-- | source3/include/includes.h | 5 | ||||
| -rw-r--r-- | 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 56624e5198..58cb39790f 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 3db676a633..e8a6d201c5 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() */ |