summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-13 10:22:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:23:00 -0500
commit72fbfff1a7c11ac96ef3e7f80691f51856a87478 (patch)
treee6ee3fb918f62345058066a63892fb5afbd1c6ea
parentdd0816dcc8482829009928e5d0dc95ec0621e833 (diff)
downloadsamba-72fbfff1a7c11ac96ef3e7f80691f51856a87478.tar.gz
samba-72fbfff1a7c11ac96ef3e7f80691f51856a87478.tar.bz2
samba-72fbfff1a7c11ac96ef3e7f80691f51856a87478.zip
r8417: fixed handling of PRINTF_ATTRIBUTE for heimdal portion of build
(This used to be commit 117d2fa31d3a7e0b37c09979aa41243c564c0385)
-rw-r--r--source4/extra_cflags.txt2
-rw-r--r--source4/lib/replace/replace.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/extra_cflags.txt b/source4/extra_cflags.txt
index a2dbd55403..0a8495e115 100644
--- a/source4/extra_cflags.txt
+++ b/source4/extra_cflags.txt
@@ -1 +1 @@
-heimdal -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include
+heimdal -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include -DNO_PRINTF_ATTRIBUTE
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index c7c343ef38..b67e629aa0 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -112,7 +112,7 @@ typedef int (*comparison_fn_t)(const void *, const void *);
#endif
#ifndef PRINTF_ATTRIBUTE
-#if (__GNUC__ >= 3)
+#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