diff options
author | Jim Meyering <jim@meyering.net> | 1998-12-13 18:04:11 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1998-12-13 18:04:11 +0000 |
commit | 29ab746b7919d8cc48a0896b4ca9b92da5152de0 (patch) | |
tree | 6ea1d81fec0b32f24ccc49b512f6fed8d73697fd /lib | |
parent | 7cf7f3706f5db7f948e8ebb765fa73dcbb163b98 (diff) | |
download | coreutils-29ab746b7919d8cc48a0896b4ca9b92da5152de0.tar.xz |
Don't include stdlib.h and declare malloc and free.
This works around Solaris 2.7's conflicting prototype.
Reported by Karl Berry.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/putenv.c | 19 |
1 files changed, 6 insertions, 13 deletions
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> |