svn commit: samba r8313 - in branches/SAMBA_4_0/source: include lib/replace

[tridge at samba.org]

Author: tridge
Date: 2005-07-11 04:17:54 +0000 (Mon, 11 Jul 2005)
New Revision: 8313

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

Log:
moved PRINTF_ATTRIBUTE to replace.h to try to get irix building with heimdal

Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2005-07-11 04:10:32 UTC (rev 8312)
+++ branches/SAMBA_4_0/source/include/includes.h	2005-07-11 04:17:54 UTC (rev 8313)
@@ -28,16 +28,6 @@
 
 #include "local.h"
 
-#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. 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)
-#endif
-
 #ifdef __GNUC__
 /** gcc attribute used on function parameters so that it does not emit
  * warnings about them being unused. **/
@@ -113,6 +103,8 @@
 extern int errno;
 #endif
 
+#include "lib/replace/replace.h"
+
 /* Lists, trees, caching, database... */
 #include "xfile.h"
 #include "lib/talloc/talloc.h"
@@ -140,7 +132,6 @@
 #include "lib/com/com.h"
 #include "credentials.h"
 
-#include "lib/replace/replace.h"
 
 
 #define malloc_p(type) (type *)malloc(sizeof(type))

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2005-07-11 04:10:32 UTC (rev 8312)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2005-07-11 04:17:54 UTC (rev 8313)
@@ -111,4 +111,16 @@
 typedef int (*comparison_fn_t)(const void *, const void *);
 #endif
 
+#ifndef PRINTF_ATTRIBUTE
+#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. 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)
 #endif
+#endif
+
+#endif