From 38fb568e7a42f206247505f9a24efa2fc680bb19 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 13 Dec 1998 18:04:11 +0000 Subject: [PATCH] Don't include stdlib.h and declare malloc and free. This works around Solaris 2.7's conflicting prototype. Reported by Karl Berry. --- lib/putenv.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/putenv.c b/lib/putenv.c index 77f720f82d..0720de5232 100644 --- a/lib/putenv.c +++ b/lib/putenv.c @@ -23,21 +23,14 @@ # include #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 -#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 -# 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 -- 2.30.2