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

diff --git a/lib/putenv.c b/lib/putenv.c
index df2f39fe5..44b89fdf3 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 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,9 +23,10 @@
 # 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
+/* 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
 
 #if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
 # include <stdlib.h>
@@ -37,8 +38,6 @@
 # include <unistd.h>
 #endif
 
-#undef putenv
-
 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
 # define strchr index
 #endif
@@ -55,7 +54,7 @@ extern char **environ;
 
 /* 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, '=');