X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsetenv.c;h=f185e04db0d58ea48be6cc22d695e4b8b1fdd74f;hb=b3b353659ac863c94e9705047710a99fa58fe0b1;hp=04073caa0391ef40020604c3c3ec2a19212c28a6;hpb=757bd39e4b07efaefaef3ef11027b7b7b40f5911;p=gnulib.git

diff --git a/lib/setenv.c b/lib/setenv.c
index 04073caa0..f185e04db 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;