From b5eeca9f7062164bc7f9761395823df3f584d136 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 15 Nov 2004 21:21:50 +0000 Subject: r3772: BUG 2006: patch from Michel Gravey ; fix build when using gcc 3.0 (This used to be commit 1bc79a28080f2ff783b49e5cf3adfdfc4a4940ee) --- source3/include/includes.h | 2 +- source3/tdb/tdb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/include/includes.h b/source3/include/includes.h index 6a1681fe1f..ef0f761ff7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -45,7 +45,7 @@ #undef HAVE_TERMIOS_H #endif -#if (__GNUC__ >= 3) +#if (__GNUC__ >= 3 ) && (__GNUC_MINOR__ >= 1 ) /** 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 diff --git a/source3/tdb/tdb.h b/source3/tdb/tdb.h index 153b6e9923..901d470a50 100644 --- a/source3/tdb/tdb.h +++ b/source3/tdb/tdb.h @@ -36,7 +36,7 @@ extern "C" { * 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) +#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 ) #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) #else #define PRINTF_ATTRIBUTE(a1, a2) -- cgit