From: Jim Meyering <jim@meyering.net>
Date: Sat, 13 Sep 2003 21:54:35 +0000 (+0000)
Subject: Update from gnulib.
X-Git-Tag: v5.1.0~615
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2be39af412edc53d4ef09097949550697c270173;p=thirdparty%2Fcoreutils.git

Update from gnulib.
---

diff --git a/lib/setenv.c b/lib/setenv.c
index 04073caa03..f185e04db0 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -28,12 +28,8 @@ extern int errno;
 # define __set_errno(ev) ((errno) = (ev))
 #endif
 
-#if _LIBC || HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #if _LIBC || HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -284,7 +280,7 @@ setenv (const char *name, const char *value, int replace)
    never made it.  Nevertheless the POSIX.9 standard (POSIX bindings
    for Fortran 77) requires this function.  */
 int
-clearenv ()
+clearenv (void)
 {
   LOCK;