summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2006-08-29 06:15:19 +0000
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2006-08-29 06:15:19 +0000
commit4bb4eeab9aefb80da4522dfde010b7c1b96ffc48 (patch)
treeff29cda953b58dbcf1797c06a1619f28af9b9b9d
parente9255b85d00e92866a4edbca355ef59d825e9705 (diff)
downloadgnulib-4bb4eeab9aefb80da4522dfde010b7c1b96ffc48.tar.gz
Sync from Libtool:
* libltdl/argz.c: Use `#ifdef HAVE_CONFIG_H', to facilitate code sharing with gnulib. Report by Eric Blake.
-rw-r--r--lib/ChangeLog11
-rw-r--r--lib/argz.c4
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index ccb82bff5c..68f25f79be 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-29 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ Sync from Libtool:
+
+ 2006-08-28 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * libltdl/argz.c: Use `#ifdef HAVE_CONFIG_H', to facilitate code
+ sharing with gnulib. Report by Eric Blake.
+
2006-08-28 Paul Eggert <eggert@cs.ucla.edu>
* fcntl_.h: New file.
@@ -29,7 +38,7 @@
Test here whether the string length is > INT_MAX.
2006-08-26 Bruno Haible <bruno@clisp.org>
- Simon Josefsson <jas@extundo.com>
+ Simon Josefsson <jas@extundo.com>
BeOS portability.
* getaddrinfo.c (PF_INET, PF_UNSPEC): New macros.
diff --git a/lib/argz.c b/lib/argz.c
index 316579a781..d00a016996 100644
--- a/lib/argz.c
+++ b/lib/argz.c
@@ -1,5 +1,5 @@
/* argz.c -- argz implementation for non-glibc systems
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2006 Free Software Foundation, Inc.
Originally by Gary V. Vaughan <gary@gnu.org>
NOTE: The canonical source of this file is maintained with the
@@ -19,7 +19,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
# if defined(LTDL) && defined LT_CONFIG_H
# include LT_CONFIG_H
# else