X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=f1974d50f5f0735bc6bd5049576f7d05ebf9a4db;hb=5e47a7f0ec2afe51c4c89bdf0696e0073bf786e1;hp=43555c07e784abad1f6813f0d2d0a75c054d52eb;hpb=181c63b9754e9e81f34772cc6a39f3d4c790d5e2;p=gnulib.git

diff --git a/lib/putenv.c b/lib/putenv.c
index 43555c07e..f1974d50f 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 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.
@@ -23,12 +23,12 @@
 # include <config.h>
 #endif
 
-/* Define-away any (possibly conflicting) prototype of putenv.
-   Many systems omit the `const' attribute on the argument.
-   But don't define-away if it's already defined (e.g. to rpl_putenv).  */
-#ifndef putenv
-# define putenv _sys_putenv
-#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>
@@ -40,8 +40,6 @@
 # include <unistd.h>
 #endif
 
-#define _sys_putenv putenv
-
 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
 # define strchr index
 #endif
@@ -55,10 +53,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)
+rpl_putenv (string)
      const char *string;
 {
   const char *const name_end = strchr (string, '=');