X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=58a498fdaa478994071938fb5765c9e2e503e358;hb=d36212cb0a461bc3f063ecbcb1c4d88316eaa397;hp=df2f39fe5d120d5611e2bb3b1a58c879eef1fec2;hpb=729a416929445412aa45238f483c266f0555c6d8;p=gnulib.git

diff --git a/lib/putenv.c b/lib/putenv.c
index df2f39fe5..58a498fda 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1997, 1998, 2000 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -17,19 +17,23 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include <errno.h>
-
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-/* Define-away any (possibly conflicting) prototype of putenv.
-   Many systems omit the `const' attribute on the argument.  */
-#define putenv _sys_putenv
+#include <sys/types.h>
+
+/* Include errno.h *after* sys/types.h to work around header problems
+   on AIX 3.2.5.  */
+#include <errno.h>
+
+/* 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_STDLIB_H)
-# include <stdlib.h>
-#endif
 #if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
 # include <string.h>
 #endif
@@ -37,8 +41,6 @@
 # include <unistd.h>
 #endif
 
-#undef putenv
-
 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
 # define strchr index
 #endif
@@ -52,11 +54,14 @@
 extern char **environ;
 #endif
 
+#ifndef NULL
+# define NULL 0
+#endif
+
 
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
 int
-putenv (string)
-     const char *string;
+rpl_putenv (const char *string)
 {
   const char *const name_end = strchr (string, '=');
   register size_t size;