svn commit: samba r22660 - in branches/SAMBA_3_0_25/source/lib/replace: . test

metze at samba.org metze at samba.org
Fri May 4 07:00:11 GMT 2007


Author: metze
Date: 2007-05-04 07:00:09 +0000 (Fri, 04 May 2007)
New Revision: 22660

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

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

jerry: this should be in 3.0.25

metze
Modified:
   branches/SAMBA_3_0_25/source/lib/replace/autoconf-2.60.m4
   branches/SAMBA_3_0_25/source/lib/replace/test/testsuite.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/lib/replace/autoconf-2.60.m4
===================================================================
--- branches/SAMBA_3_0_25/source/lib/replace/autoconf-2.60.m4	2007-05-04 06:59:26 UTC (rev 22659)
+++ branches/SAMBA_3_0_25/source/lib/replace/autoconf-2.60.m4	2007-05-04 07:00:09 UTC (rev 22660)
@@ -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)
 # --------------------------------------------------------------

Modified: branches/SAMBA_3_0_25/source/lib/replace/test/testsuite.c
===================================================================
--- branches/SAMBA_3_0_25/source/lib/replace/test/testsuite.c	2007-05-04 06:59:26 UTC (rev 22659)
+++ branches/SAMBA_3_0_25/source/lib/replace/test/testsuite.c	2007-05-04 07:00:09 UTC (rev 22660)
@@ -511,7 +511,7 @@
 		       "\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)



More information about the samba-cvs mailing list