diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2009-09-28 06:46:03 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2009-09-28 06:46:03 +0000 |
| commit | f9c15cac3504546cb5ebf74241fc13ba2700691a (patch) | |
| tree | 282704018905524820c70c1b62afb4e67dec778a /glob | |
| parent | bf1794767e31cc7b12ee313573a9b86ea1eca08f (diff) | |
| download | make-f9c15cac3504546cb5ebf74241fc13ba2700691a.tar.gz | |
* glob.c (my_realloc) [__DJGPP__]: Don't define, and don't
redefine realloc to call it, since the DJGPP's realloc handles
NULL pointers correctly.
Diffstat (limited to 'glob')
| -rw-r--r-- | glob/ChangeLog | 8 | ||||
| -rw-r--r-- | glob/glob.c | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/glob/ChangeLog b/glob/ChangeLog index a6675e0..8f0739c 100644 --- a/glob/ChangeLog +++ b/glob/ChangeLog @@ -1,6 +1,12 @@ +2008-09-28 Juan Manuel Guerrero <juan.guerrero@gmx.de> + + * glob.c (my_realloc) [__DJGPP__]: Don't define, and don't + redefine realloc to call it, since the DJGPP's realloc handles + NULL pointers correctly. + 2007-12-22 Juan Manuel Guerrero <juan.guerrero@gmx.de> (tiny change) - * glob/glob.c [__GNU_LIBRARY__ && __DJGPP__]: Add a realloc + * glob.c [__GNU_LIBRARY__ && __DJGPP__]: Add a realloc declaration that matches the one in the DJGPP libc. 2006-02-24 Eli Zaretskii <eliz@gnu.org> diff --git a/glob/glob.c b/glob/glob.c index b9063c3..1a19205 100644 --- a/glob/glob.c +++ b/glob/glob.c @@ -182,7 +182,7 @@ extern void bcopy (); # define mempcpy(Dest, Src, Len) __mempcpy (Dest, Src, Len) #endif -#ifndef __GNU_LIBRARY__ +#if !defined __GNU_LIBRARY__ && !defined __DJGPP__ # ifdef __GNUC__ __inline # endif @@ -190,9 +190,6 @@ __inline # ifdef WINDOWS32 static void * my_realloc (void *p, unsigned int n) -# elif defined(__DJGPP__) -static void * -my_realloc (void *p, size_t n) # else static char * my_realloc (p, n) @@ -208,7 +205,7 @@ my_realloc (p, n) } # define realloc my_realloc # endif /* __SASC */ -#endif /* __GNU_LIBRARY__ */ +#endif /* __GNU_LIBRARY__ || __DJGPP__ */ #if !defined __alloca && !defined __GNU_LIBRARY__ |