diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-05-04 06:59:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:53 -0500 |
| commit | c5bcb4b31a1bb6eb14910318abff99f7fff9ba78 (patch) | |
| tree | 1bf0377e299bab8a85d1848a50354c0c4d6a28f9 | |
| parent | e7d06b1c258aa6ea7d039c2d592fbfff96fccafc (diff) | |
| download | samba-c5bcb4b31a1bb6eb14910318abff99f7fff9ba78.tar.gz samba-c5bcb4b31a1bb6eb14910318abff99f7fff9ba78.tar.bz2 samba-c5bcb4b31a1bb6eb14910318abff99f7fff9ba78.zip | |
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
(This used to be commit cb785d9bed23fdf930bbd059eeeba5bde04af829)
| -rw-r--r-- | source3/lib/replace/autoconf-2.60.m4 | 13 | ||||
| -rw-r--r-- | source3/lib/replace/test/testsuite.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/source3/lib/replace/autoconf-2.60.m4 b/source3/lib/replace/autoconf-2.60.m4 index 5360fff5d2..acdcd38efe 100644 --- a/source3/lib/replace/autoconf-2.60.m4 +++ b/source3/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/source3/lib/replace/test/testsuite.c b/source3/lib/replace/test/testsuite.c index 2d068c559f..54ffd6a66d 100644 --- a/source3/lib/replace/test/testsuite.c +++ b/source3/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) |