* 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.

diff --git a/glob/ChangeLog b/glob/ChangeLog
index a6675e056996efbea987f74a45d5feca31857124..8f0739c2b3516801c1a01751a5293991172465f0 100644 (file)
--- 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 b9063c3c91bf800cf954e1ff8b0f7e603a5bfd45..1a1920519b17f2034a1d855c57f00e818e5b796e 100644 (file)
--- 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__