Mercurial > gnulib
changeset 29238:28bab0152c5b
Fix link error in relocatability wrappers, due to xalloc_die().
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 26 Dec 2007 16:25:28 +0100 |
parents | 4642f5a84b96 |
children | 0cc36cd5f024 |
files | ChangeLog build-aux/install-reloc lib/progreloc.c lib/relocwrapper.c modules/relocatable-prog-wrapper |
diffstat | 5 files changed, 22 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Dec 26 16:23:54 2007 +0100 +++ b/ChangeLog Wed Dec 26 16:25:28 2007 +0100 @@ -1,3 +1,14 @@ +2007-12-24 Bruno Haible <bruno@clisp.org> + + Fix link error due to xalloc_die(). + * lib/progreloc.c: When NO_XMALLOC is defined, use areadlink instead + of xreadlink. + * lib/relocwrapper.c: Update comments. + * build-aux/install-reloc: Remove xreadlink.c from file list. + * modules/relocatable-prog-wrapper (Files): Remove xreadlink.h and + xreadlink.c. + Reported by Левашев Иван <octagram@bluebottle.com>. + 2007-12-24 Bruno Haible <bruno@clisp.org> Split setenv module into setenv and unsetenv. Get rid of setenv.h.
--- a/build-aux/install-reloc Wed Dec 26 16:23:54 2007 +0100 +++ b/build-aux/install-reloc Wed Dec 26 16:25:28 2007 +0100 @@ -131,7 +131,6 @@ "$srcdir"/relocwrapper.c \ "$srcdir"/progname.c \ "$srcdir"/progreloc.c \ - "$srcdir"/xreadlink.c \ "$srcdir"/areadlink.c \ "$srcdir"/readlink.c \ "$srcdir"/canonicalize-lgpl.c \
--- a/lib/progreloc.c Wed Dec 26 16:23:54 2007 +0100 +++ b/lib/progreloc.c Wed Dec 26 16:25:28 2007 +0100 @@ -1,5 +1,5 @@ /* Provide relocatable programs. - Copyright (C) 2003-2006 Free Software Foundation, Inc. + Copyright (C) 2003-2007 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify @@ -43,11 +43,17 @@ # include <windows.h> #endif -#include "xreadlink.h" #include "canonicalize.h" #include "relocatable.h" #ifdef NO_XMALLOC +# include "areadlink.h" +# define xreadlink areadlink +#else +# include "xreadlink.h" +#endif + +#ifdef NO_XMALLOC # define xmalloc malloc # define xstrdup strdup #else
--- a/lib/relocwrapper.c Wed Dec 26 16:23:54 2007 +0100 +++ b/lib/relocwrapper.c Wed Dec 26 16:25:28 2007 +0100 @@ -19,11 +19,11 @@ relocwrapper -> progname -> progreloc - -> xreadlink - -> areadlink - -> readlink + -> areadlink + -> readlink -> canonicalize-lgpl -> malloca + -> readlink -> relocatable -> setenv -> malloca