From: Jim Meyering <jim@meyering.net>
Date: Sun, 13 Dec 1998 18:04:11 +0000 (+0000)
Subject: Don't include stdlib.h and declare malloc and free.
X-Git-Tag: cvs-readonly~7602
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=38fb568e7a42f206247505f9a24efa2fc680bb19;p=gnulib.git

Don't include stdlib.h and declare malloc and free.
This works around Solaris 2.7's conflicting prototype.
Reported by Karl Berry.
---

diff --git a/lib/putenv.c b/lib/putenv.c
index 77f720f82..0720de523 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -23,21 +23,14 @@
 # include <config.h>
 #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)
-/* Some stdlib.h (e.g., Solaris 2.7) declare putenv with a non-const argument.
-   Since that would conflict with the declaration below, we rename putenv in
-   that incompatible prototype.  */
-# define putenv vendor_putenv_prototype
-# include <stdlib.h>
-# undef putenv
-#endif
+/* 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_STRING_H)
 # include <string.h>