From: Bruno Haible <bruno@clisp.org>
Date: Sat, 27 Dec 2003 15:40:09 +0000 (+0000)
Subject: Merge from gnulib: Assume ANSI C.
X-Git-Tag: v0.14~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b6527e96869e3ca4e2ef383e1393bc687b19ba8;p=thirdparty%2Fgettext.git

Merge from gnulib: Assume ANSI C.
---

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 849041991..6ae58d663 100644
--- 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 f2082cdbe..55b9bf2da 100644
--- 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 734589dce..5f9ec6bae 100644
--- 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