X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=87c5522810ac60ad8b61bf2ad990810642c523ab;hb=de436cfd34d49953182ea29aea1d9352b6ac106c;hp=0b1e6644e4f2b2d5d6afffb2a1c1891a68a47137;hpb=310c41f74d42756b22ed2fcbe42b69bbe75a9ecf;p=gnulib.git

diff --git a/lib/putenv.c b/lib/putenv.c
index 0b1e6644e..87c552281 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -33,27 +33,19 @@ extern int errno;
 # define __set_errno(ev) ((errno) = (ev))
 #endif
 
-/* Don't include stdlib.h because some (e.g., Solaris 2.7) declare putenv
+/* Don't include stdlib.h because some (e.g., Solaris 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 *malloc ();
 void free ();
 
-#if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
-# include <string.h>
-#endif
+#include <string.h>
+
 #if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
 # include <unistd.h>
 #endif
 
-#if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
-# define strchr index
-#endif
-#if !defined (__GNU_LIBRARY__) && !defined (HAVE_MEMCPY)
-# define memcpy(d,s,n) bcopy ((s), (d), (n))
-#endif
-
 #if HAVE_GNU_LD
 # define environ __environ
 #else
@@ -71,10 +63,6 @@ __libc_lock_define_initialized (static, envlock)
 # define UNLOCK
 #endif
 
-#ifndef NULL
-# define NULL 0
-#endif
-
 static int
 unsetenv (const char *name)
 {