Avoid relocwrapper link errors due to gnulib replacement functions.

diff --git a/ChangeLog b/ChangeLog
index aa2ac1a0d79d12f60176f859c864c166dff4f3ac..d8cafae3ba7c57ad4f34d6f4784b0911eab5142e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-09  Bruno Haible  <bruno@clisp.org>
+
+       Avoid relocwrapper link errors due to gnulib replacement functions.
+       * lib/canonicalize-lgpl.c: Use the system's malloc function.
+       * lib/malloca.c: Likewise.
+       * lib/relocatable.c: Likewise.
+       * lib/progreloc.c: Use the system's malloc, sprintf functions.
+       * lib/relocwrapper.c: Use the system's fprintf, malloc functions.
+       * lib/setenv.c: Use the system's malloc, realloc functions.
+       * lib/strerror.c: Use the system's sprintf function.
+       Reported by Ben Pfaff <blp@cs.stanford.edu>.
+
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
        Prefer documented low-level autoconf macro names.

diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index 939e3f1149471b363cdc523484473913fb1e5cef..c2164e07fede152ed7a93e9a0f18cf2229d8a907 100644 (file)
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -62,6 +62,8 @@
 # endif
 # define __readlink readlink
 # define __set_errno(e) errno = (e)
+/* Use the system functions, not the gnulib overrides in this file.  */
+# undef malloc
 # ifndef MAXSYMLINKS
 #  ifdef SYMLOOP_MAX
 #   define MAXSYMLINKS SYMLOOP_MAX

diff --git a/lib/malloca.c b/lib/malloca.c
index b0e6ab6edbf46efc0135edffcc5184ab82f68b54..226887849f43799f090f8d1068b18a95694c3f86 100644 (file)
--- a/lib/malloca.c
+++ b/lib/malloca.c
@@ -21,6 +21,9 @@
 /* Specification.  */
 #include "malloca.h"
 
+/* Use the system functions, not the gnulib overrides in this file.  */
+#undef malloc
+
 /* The speed critical point in this file is freea() applied to an alloca()
    result: it must be fast, to match the speed of alloca().  The speed of
    mmalloca() and freea() in the other case are not critical, because they

diff --git a/lib/progreloc.c b/lib/progreloc.c
index 8aa33b75081a4c28f0826d8b6832411e897e4099..1e27de72cbe54e837029faacc375acc484c43ee5 100644 (file)
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -89,6 +89,10 @@ extern char * canonicalize_file_name (const char *name);
 #undef open
 #undef close
 
+/* Use the system functions, not the gnulib overrides in this file.  */
+#undef malloc
+#undef sprintf
+
 #undef set_program_name
 
 

diff --git a/lib/relocatable.c b/lib/relocatable.c
index 172e91c93e0b6df9bed37692c2601de7c1d0f9c6..f0ac6d1058bc5fd852ac0f8265dd617228a5013b 100644 (file)
--- a/lib/relocatable.c
+++ b/lib/relocatable.c
@@ -86,6 +86,9 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
+/* Use the system functions, not the gnulib overrides in this file.  */
+#undef malloc
+
 /* Original installation prefix.  */
 static char *orig_prefix;
 static size_t orig_prefix_len;

diff --git a/lib/relocwrapper.c b/lib/relocwrapper.c
index 19dfaa383cb06222df17600d6c571b5913e7be93..04f2258c97bb14e6eba0919644638b3c82d384e1 100644 (file)
--- a/lib/relocwrapper.c
+++ b/lib/relocwrapper.c
@@ -55,6 +55,10 @@
 #include "relocatable.h"
 #include "c-ctype.h"
 
+/* Use the system functions, not the gnulib overrides in this file.  */
+#undef fprintf
+#undef malloc
+
 /* Return a copy of the filename, with an extra ".bin" at the end.
    More generally, it replaces "${EXEEXT}" at the end with ".bin${EXEEXT}".  */
 static char *

diff --git a/lib/setenv.c b/lib/setenv.c
index 178191c6173f161e20d0a63e395037a404c34498..ba760d6f23d0ed87b8cd22b70b5733bff0aeac94 100644 (file)
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -64,6 +64,10 @@ __libc_lock_define_initialized (static, envlock)
 # define clearenv __clearenv
 # define tfind __tfind
 # define tsearch __tsearch
+#else
+/* Use the system functions, not the gnulib overrides in this file.  */
+# undef malloc
+# undef realloc
 #endif
 
 /* In the GNU C library implementation we try to be more clever and

diff --git a/lib/strerror.c b/lib/strerror.c
index b0df7784898a90c5f284cd30bd880c92f1165621..46153abf5f08799d4c9917e59a2a1b33c96fdd6e 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -32,6 +32,9 @@
 
 # include "intprops.h"
 
+/* Use the system functions, not the gnulib overrides in this file.  */
+# undef sprintf
+
 # undef strerror
 # if ! HAVE_DECL_STRERROR
 #  define strerror(n) NULL