X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargz.c;h=253c6f50c20792a1319e2e4ed27afacd410758b4;hb=20229ba96d971f97ff03ab74eeb4e7de1acccf98;hp=d00a01699605a1131c0d113902975c2edea1280f;hpb=4bb4eeab9aefb80da4522dfde010b7c1b96ffc48;p=gnulib.git

diff --git a/lib/argz.c b/lib/argz.c
index d00a01699..253c6f50c 100644
--- a/lib/argz.c
+++ b/lib/argz.c
@@ -1,5 +1,5 @@
 /* argz.c -- argz implementation for non-glibc systems
-   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
    Originally by Gary V. Vaughan  <gary@gnu.org>
 
    NOTE: The canonical source of this file is maintained with the
@@ -19,12 +19,10 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifdef HAVE_CONFIG_H
-#  if defined(LTDL) && defined LT_CONFIG_H
-#    include LT_CONFIG_H
-#  else
-#    include <config.h>
-#  endif
+#if defined(LTDL) && defined LT_CONFIG_H
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #include <argz.h>
@@ -34,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'