From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 4 May 2007 06:59:26 +0000 (+0000)
Subject: r22659: merge from SAMBA_4_0:
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~557
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb785d9bed23fdf930bbd059eeeba5bde04af829;p=thirdparty%2Fsamba.git

r22659: merge from SAMBA_4_0:

- add AC_GNU_SOURCE macro for systems which don't have it
  (sles8)
- fix compiler warning on some systems

metze
---

diff --git a/source/lib/replace/autoconf-2.60.m4 b/source/lib/replace/autoconf-2.60.m4
index 5360fff5d24..acdcd38efe6 100644
--- a/source/lib/replace/autoconf-2.60.m4
+++ b/source/lib/replace/autoconf-2.60.m4
@@ -1,3 +1,16 @@
+# AC_GNU_SOURCE
+# --------------
+AC_DEFUN([AC_GNU_SOURCE],
+[AH_VERBATIM([_GNU_SOURCE],
+[/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif])dnl
+AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+AC_DEFINE([_GNU_SOURCE])
+])
+
 # _AC_C_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST,
 #		ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE)
 # --------------------------------------------------------------
diff --git a/source/lib/replace/test/testsuite.c b/source/lib/replace/test/testsuite.c
index 2d068c559f3..54ffd6a66de 100644
--- a/source/lib/replace/test/testsuite.c
+++ b/source/lib/replace/test/testsuite.c
@@ -511,7 +511,7 @@ static int test_inet_ntoa(void)
 		       "\tptr: %p - %p = %d != %d\n" \
 		       "]\n", \
 		       __STRING(func), __location__, __STRING(func), \
-		       str, diff, base, res, _v, _ep, _p, diff - (_ep - _p), diff); \
+		       str, diff, base, res, _v, _ep, _p, (int)(diff - (_ep - _p)), diff); \
 		return false; \
 	} \
 } while (0)