diff options
Diffstat (limited to 'src/kmk/glob')
| -rw-r--r-- | src/kmk/glob/ChangeLog | 8 | ||||
| -rw-r--r-- | src/kmk/glob/glob.c | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/kmk/glob/ChangeLog b/src/kmk/glob/ChangeLog index a6675e0..8f0739c 100644 --- a/src/kmk/glob/ChangeLog +++ b/src/kmk/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/src/kmk/glob/glob.c b/src/kmk/glob/glob.c index ee282c0..a948e41 100644 --- a/src/kmk/glob/glob.c +++ b/src/kmk/glob/glob.c @@ -182,7 +182,7 @@ extern void bcopy (); # define mempcpy(Dest, Src, Len) __mempcpy (Dest, Src, Len) #endif -#if !defined(__GNU_LIBRARY__) && !defined(ELECTRIC_HEAP) && !defined(__APPLE__) /* bird (last two) */ +#if !defined __GNU_LIBRARY__ && !defined __DJGPP__ && !defined ELECTRIC_HEAP && !defined __APPLE__ /* bird (last two) */ # ifdef __GNUC__ __inline # endif @@ -191,9 +191,6 @@ __inline # include <malloc.h> 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) @@ -209,7 +206,7 @@ my_realloc (p, n) } # define realloc my_realloc # endif /* __SASC */ -#endif /* __GNU_LIBRARY__ */ +#endif /* __GNU_LIBRARY__ || __DJGPP__ */ #if !defined __alloca && !defined __GNU_LIBRARY__ @@ -388,7 +385,7 @@ glob (pattern, flags, errfunc, pglob) { /* Allocate working buffer large enough for our work. Note that we have at least an opening and closing brace. */ - size_t firstc; + size_t firstc; /* bird: correct type. */ char *alt_start; const char *p; const char *next; |