X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=0720de5232d9108126593305cb2102aac043e370;hb=e9721c2f5a8ea905fba888055ca0fd0767f8873d;hp=f1974d50f5f0735bc6bd5049576f7d05ebf9a4db;hpb=2ea9c49d9514a0dfdd33febd12f91a88239bb686;p=gnulib.git

diff --git a/lib/putenv.c b/lib/putenv.c
index f1974d50f..0720de523 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -23,16 +23,15 @@
 # include <config.h>
 #endif
 
-/* Disable the definition of putenv to rpl_putenv (from config.h) in this
-   file.  Otherwise, we'd get conflicting prototypes for rpl_putenv on
-   systems like Irix 5.3.  */
-#undef putenv
-
 #include <sys/types.h>
 
-#if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
-# include <stdlib.h>
-#endif
+/* Don't include stdlib.h because some (e.g., Solaris 2.7) declare putenv
+   with a non-const argument.  That would conflict with the declaration of
+   rpl_putenv below (due to the #define putenv rpl_putenv from config.h).  */
+
+char *malloc ();
+void free ();
+
 #if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
 # include <string.h>
 #endif
@@ -60,8 +59,7 @@ extern char **environ;
 
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
 int
-rpl_putenv (string)
-     const char *string;
+rpl_putenv (const char *string)
 {
   const char *const name_end = strchr (string, '=');
   register size_t size;