* libc/include/stdlib.h: Avoid declaring cfree under Cygwin.

* libc/include/malloc.h: Ditto.  Also remove obsolete declaration.
This commit is contained in:
Christopher Faylor 2000-10-30 01:08:58 +00:00
parent 75a57bf04a
commit 86fff69f62
3 changed files with 12 additions and 16 deletions

View File

@ -1,3 +1,8 @@
Sun Oct 29 20:06:41 2000 Christopher Faylor <cgf@cygnus.com>
* libc/include/stdlib.h: Avoid declaring cfree under Cygwin.
* libc/include/malloc.h: Ditto. Also remove obsolete declaration.
Tue Oct 24 20:16:00 2000 Corinna Vinschen <vinschen@cygnus.com>
* libc/include/sys/unistd.h: Add defines for sysconf values

View File

@ -70,25 +70,15 @@ extern _PTR _pvalloc_r _PARAMS ((struct _reent *, size_t));
extern int malloc_trim _PARAMS ((size_t));
extern int _malloc_trim_r _PARAMS ((struct _reent *, size_t));
/* Some systems provide this, so do too for compatibility. */
extern void cfree _PARAMS ((_PTR));
/* A compatibility routine for an earlier version of the allocator. */
extern _VOID mstats _PARAMS ((char *));
extern _VOID _mstats_r _PARAMS ((struct _reent *, char *));
#ifdef __CYGWIN__
/* Cygwin32 needs to be able to copy all the malloc information from
the parent to the child. However, cygwin32 does not normally copy
any data in the DLL data section. This routine handles copying
that information. */
extern int __malloc_copy _PARAMS ((int (*) (void *, void *, void *, int),
void *, int));
#endif /* __CYGWIN */
#ifndef __CYGWIN__
/* Some systems provide this, so do too for compatibility. */
extern void cfree _PARAMS ((_PTR));
#endif /* __CYGWIN__ */
#ifdef __cplusplus
}

View File

@ -92,7 +92,6 @@ unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *_n_PTR, char **_end
int _EXFUN(system,(const char *__string));
#ifndef __STRICT_ANSI__
_VOID _EXFUN(cfree,(_PTR));
int _EXFUN(putenv,(const char *__string));
int _EXFUN(_putenv_r,(struct _reent *, const char *__string));
int _EXFUN(setenv,(const char *__string, const char *__value, int __overwrite));
@ -109,7 +108,9 @@ char * _EXFUN(ecvtf,(float,int,int *,int *));
char * _EXFUN(dtoa,(double, int, int, int *, int*, char**));
int _EXFUN(rand_r,(unsigned *__seed));
#ifdef __CYGWIN__
#ifndef __CYGWIN__
_VOID _EXFUN(cfree,(_PTR));
#else
char * _EXFUN(realpath,(const char *, char *));
void _EXFUN(unsetenv,(const char *__string));
void _EXFUN(_unsetenv_r,(struct _reent *, const char *__string));