(parse_long_options): Remove version-, copyright-,

[gnulib.git] / lib / putenv.c

diff --git a/lib/putenv.c b/lib/putenv.c
index 5e9a863..0720de5 100644 (file)
--- 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,16 +23,15 @@
 # include <config.h>
 #endif
 
-/* Define-away any (possibly conflicting) prototype of putenv.
-   Many systems omit the `const' attribute on the argument.
-   Define-away only if it's not already defined (e.g. to rpl_putenv).  */
-#ifndef putenv
-# define putenv _sys_putenv
-#endif
+#include <sys/types.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
@@ -40,10 +39,6 @@
 # include <unistd.h>
 #endif
 
-#ifndef putenv
-# undef putenv
-#endif
-
 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
 # define strchr index
 #endif
@@ -57,11 +52,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;