Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13397:758ef73803db
Avoid relocwrapper link errors due to gnulib replacement functions.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Wed, 09 Jun 2010 12:47:59 +0200 |
| parents | a6b472aaadaf |
| children | 9805d62bae4f |
| files | ChangeLog lib/canonicalize-lgpl.c lib/malloca.c lib/progreloc.c lib/relocatable.c lib/relocwrapper.c lib/setenv.c lib/strerror.c |
| diffstat | 8 files changed, 35 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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
--- 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
--- a/lib/progreloc.c +++ b/lib/progreloc.c @@ -89,6 +89,10 @@ #undef open #undef close +/* Use the system functions, not the gnulib overrides in this file. */ +#undef malloc +#undef sprintf + #undef set_program_name
--- 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;
--- 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 *
--- a/lib/setenv.c +++ b/lib/setenv.c @@ -64,6 +64,10 @@ # 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