svn commit: samba r3772 - in branches/SAMBA_3_0/source: include tdb

jerry at samba.org jerry at samba.org
Mon Nov 15 21:21:50 GMT 2004


Author: jerry
Date: 2004-11-15 21:21:50 +0000 (Mon, 15 Nov 2004)
New Revision: 3772

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3772

Log:
BUG 2006: patch from Michel Gravey <michel.gravey at optogone.com>; fix build when using gcc 3.0
Modified:
   branches/SAMBA_3_0/source/include/includes.h
   branches/SAMBA_3_0/source/tdb/tdb.h


Changeset:
Modified: branches/SAMBA_3_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0/source/include/includes.h	2004-11-15 20:57:27 UTC (rev 3771)
+++ branches/SAMBA_3_0/source/include/includes.h	2004-11-15 21:21:50 UTC (rev 3772)
@@ -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

Modified: branches/SAMBA_3_0/source/tdb/tdb.h
===================================================================
--- branches/SAMBA_3_0/source/tdb/tdb.h	2004-11-15 20:57:27 UTC (rev 3771)
+++ branches/SAMBA_3_0/source/tdb/tdb.h	2004-11-15 21:21:50 UTC (rev 3772)
@@ -36,7 +36,7 @@
  * 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)



More information about the samba-cvs mailing list