Mercurial > hg > octave-lojdl > gnulib-hg
changeset 1570:0a751006ca02
Don't include stdlib.h and declare malloc and free.
This works around Solaris 2.7's conflicting prototype.
Reported by Karl Berry.
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sun, 13 Dec 1998 18:04:11 +0000 |
| parents | eb38fa27404e |
| children | 1d40278d4afa |
| files | lib/putenv.c |
| diffstat | 1 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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>