Merge from gnulib: Assume ANSI C.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 8490419914bd43d1cd6e286164e8312a1588394a..6ae58d663927daa0660b47e98c8642d91d8ef43f 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-12  Paul Eggert  <eggert@twinsun.com>
+
+       * setenv.c (clearenv): Define via prototype.
+
+2003-09-10  Bruno Haible  <bruno@clisp.org>
+
+       * setenv.c: Include <stdlib.h> and <string.h> unconditionally.
+       * unsetenv.c: Likewise.
+
 2003-12-12  Bruno Haible  <bruno@clisp.org>
 
        Assume automake-1.8.

diff --git a/gettext-tools/lib/setenv.c b/gettext-tools/lib/setenv.c
index f2082cdbe9d517f5d614c32e8e63a84a34613b39..55b9bf2da1638c04246fca584e48a2f6358accd7 100644 (file)
--- a/gettext-tools/lib/setenv.c
+++ b/gettext-tools/lib/setenv.c
@@ -29,12 +29,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
@@ -296,7 +292,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;
 

diff --git a/gettext-tools/lib/unsetenv.c b/gettext-tools/lib/unsetenv.c
index 734589dce0a620050f233bbb78f1341f380bdfda..5f9ec6bae8ee9a313465d32eeb5e1aefa359042d 100644 (file)
--- a/gettext-tools/lib/unsetenv.c
+++ b/gettext-tools/lib/unsetenv.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