diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-04-22 00:01:17 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2008-04-22 00:01:17 +0200 |
| commit | 56feeb13d6ee860c4ba0a1b5020a2a9a55fe67b9 (patch) | |
| tree | 0c45d5faa28007c372614cb8f23345aa93a38013 | |
| parent | bfca3459b4916724328bc9779cbc4e5934417c09 (diff) | |
| download | gnulib-56feeb13d6ee860c4ba0a1b5020a2a9a55fe67b9.tar.gz | |
Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl' differently.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/canonicalize-lgpl.c | 2 | ||||
| -rw-r--r-- | lib/canonicalize.c | 4 | ||||
| -rw-r--r-- | modules/canonicalize-lgpl | 1 |
4 files changed, 13 insertions, 3 deletions
@@ -1,5 +1,14 @@ 2008-04-20 Bruno Haible <bruno@clisp.org> + Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl', + take 2. + * lib/canonicalize.c (canonicalize_file_name): Elide if the + 'canonicalize-lgpl' module is also used. + * lib/canonicalize-lgpl.c: Undo last change. + * modules/canonicalize-lgpl (configure.ac): Invoke gl_MODULE_INDICATOR. + +2008-04-20 Bruno Haible <bruno@clisp.org> + * lib/mkdir.c (mkdir): Undefine after the includes, not right after config.h. Provide _mkdir based fallback for mingw. * lib/sys_stat.in.h (mkdir): Define through an 'extern' declaration diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index 7446dfdfe9..80bef72c16 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -21,7 +21,7 @@ <stdlib.h> on Solaris 2.5.1. */ #undef realpath -#if !(HAVE_CANONICALIZE_FILE_NAME || (GNULIB_CANONICALIZE && !defined IN_RELOCWRAPPER)) || defined _LIBC +#if !HAVE_CANONICALIZE_FILE_NAME || defined _LIBC #include <alloca.h> diff --git a/lib/canonicalize.c b/lib/canonicalize.c index f0a4762b78..4f348398fd 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2007 Free Software Foundation, Inc. + Copyright (C) 1996-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ #include "pathmax.h" #include "areadlink.h" -#if !HAVE_CANONICALIZE_FILE_NAME +#if !(HAVE_CANONICALIZE_FILE_NAME || GNULIB_CANONICALIZE_LGPL) /* Return the canonical absolute name of file NAME. A canonical name does not contain any `.', `..' components nor any repeated file name separators ('/') or symlinks. All components must exist. diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl index 2514f43377..129e813aaa 100644 --- a/modules/canonicalize-lgpl +++ b/modules/canonicalize-lgpl @@ -14,6 +14,7 @@ readlink configure.ac: gl_CANONICALIZE_LGPL +gl_MODULE_INDICATOR([canonicalize-lgpl]) Makefile.am: |