Changeset 39 for trunk/samba/source/lib/replace

Timestamp:

May 27, 2007, 12:26:26 AM (18 years ago)

Author:

Paul Smedley

Message:

Upgrade source to 3.0.25a

Location:

trunk/samba/source/lib/replace

Files:

• autoconf-2.60.m4 (modified) (1 diff)
• dlfcn.m4 (modified) (1 diff)
• test/testsuite.c (modified) (1 diff)

trunk/samba/source/lib/replace/autoconf-2.60.m4

@@ +1 @@
+# 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)

trunk/samba/source/lib/replace/dlfcn.m4

@@ -3 +3 @@
 LIBS=""
 
+libreplace_cv_dlfcn=no
 AC_SEARCH_LIBS(dlopen, dl)
 
-if test "$ac_cv_search_dlopen" != no; then
+if test x"${ac_cv_search_dlopen}" = x"no"; then
+        libreplace_cv_dlfcn=yes
+else
         AC_CHECK_HEADERS(dlfcn.h)
+        AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_cv_dlfcn=yes])
+fi
 
-        libreplace_cv_dlfcn=no
-        AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_cv_dlfcn=yes])
-
-        if test x"${libreplace_cv_dlfcn}" = x"yes";then
-                LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
-        fi
+if test x"${libreplace_cv_dlfcn}" = x"yes";then
+        LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
 fi
 

trunk/samba/source/lib/replace/test/testsuite.c

@@ -512 +512 @@
                        "]\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; \
         } \