Sync from Libtool.

* lib/argz.c: Do not include strings.h nor memory.h, include
string.h unconditionally.  Patch by Simon Josefsson.

diff --git a/ChangeLog b/ChangeLog
index ee4782fa7d26a79e9ce89b113a5e2a8e773ffa0d..93ba5d7627bd80abbe425456def1e16dd143aeb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Sync from Libtool.
+       * lib/argz.c: Do not include strings.h nor memory.h, include
+       string.h unconditionally.  Patch by Simon Josefsson.
+
 2007-01-27  Bruno Haible  <bruno@clisp.org>
 
        * m4/string_h.m4 (gl_HEADER_STRING_H_DEFAULTS): New macro, extracted

diff --git a/lib/argz.c b/lib/argz.c
index ff1a4f644d9837c81226cf7845aecb0596f107eb..4bd625174172a5f40c6bb9d33240d04a182303c1 100644 (file)
--- a/lib/argz.c
+++ b/lib/argz.c
@@ -32,15 +32,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <errno.h>
-
-#if defined(HAVE_STRING_H)
-#  include <string.h>
-#elif defined(HAVE_STRINGS_H)
-#  include <strings.h>
-#endif
-#if defined(HAVE_MEMORY_H)
-#  include <memory.h>
-#endif
+#include <string.h>
 
 #define EOS_CHAR '\0'