From 2881adf0537d8691ba819514c7dc396d8b66eb5e Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 27 Jan 2007 16:49:19 +0000
Subject: [PATCH] Sync from Libtool. * lib/argz.c: Do not include strings.h nor
 memory.h, include string.h unconditionally.  Patch by Simon Josefsson.

---
 ChangeLog  |  6 ++++++
 lib/argz.c | 10 +---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee4782fa7d..93ba5d7627 100644
--- 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 ff1a4f644d..4bd6251741 100644
--- 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'
 
-- 
2.30.2