summaryrefslogtreecommitdiff
path: root/source4/include/includes.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-09 21:44:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:57 -0500
commit5c8447773f306e302c7182611e4fc03978c340b6 (patch)
tree912ffdb6b8f878350e3f3f27c3ea414a7a06fade /source4/include/includes.h
parent1f10e729c024cba1d530733ef98c22e2acd7dc19 (diff)
downloadsamba-5c8447773f306e302c7182611e4fc03978c340b6.tar.gz
samba-5c8447773f306e302c7182611e4fc03978c340b6.tar.bz2
samba-5c8447773f306e302c7182611e4fc03978c340b6.zip
r12801: Some more include/ cleanups (remove unused macros + move files
to specific dirs) (This used to be commit 243cf760b077e155f5ac508aeebf819f7708a84e)
Diffstat (limited to 'source4/include/includes.h')
-rw-r--r--source4/include/includes.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index dd4f19009a..fae9a29a9c 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -36,6 +36,18 @@
/** Feel free to add definitions for other compilers here. */
#endif
+#ifndef PRINTF_ATTRIBUTE
+#if !defined(NO_PRINTF_ATTRIBUTE) && (__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
+
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
@@ -79,7 +91,7 @@ struct ipv4_addr {
/* Lists, trees, caching, database... */
#include "xfile.h"
-#include "lib/talloc/talloc.h"
+#include "talloc/talloc.h"
#include "nt_status.h"
#include "structs.h"
#include "trans2.h"