Mercurial > gnulib
changeset 9918:82e6377c749d
Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl'.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 13 Apr 2008 22:39:41 +0200 |
parents | 35130d1e3a53 |
children | 751833dcb7cb |
files | ChangeLog lib/canonicalize-lgpl.c |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Apr 13 22:17:09 2008 +0200 +++ b/ChangeLog Sun Apr 13 22:39:41 2008 +0200 @@ -1,3 +1,9 @@ +2008-04-13 Bruno Haible <bruno@clisp.org> + + Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl'. + * lib/canonicalize-lgpl.c: Elide the contents if the 'canonicalize' + module is also used and while not building the reloc-wrapper. + 2008-04-13 Bruno Haible <bruno@clisp.org> * tests/test-getaddrinfo.c (simple): Ignore EAI_NODATA error.
--- a/lib/canonicalize-lgpl.c Sun Apr 13 22:17:09 2008 +0200 +++ b/lib/canonicalize-lgpl.c Sun Apr 13 22:39:41 2008 +0200 @@ -21,7 +21,7 @@ <stdlib.h> on Solaris 2.5.1. */ #undef realpath -#if !HAVE_CANONICALIZE_FILE_NAME || defined _LIBC +#if !(HAVE_CANONICALIZE_FILE_NAME || (GNULIB_CANONICALIZE && !defined IN_RELOCWRAPPER)) || defined _LIBC #include <alloca.h>