summaryrefslogtreecommitdiff
path: root/glob
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2007-12-22 11:28:49 +0000
committerEli Zaretskii <eliz@gnu.org>2007-12-22 11:28:49 +0000
commitb65a552aed31768254b00479637a241571af3f8d (patch)
tree462098ca02d96390de0a6caec58df405cf13ce41 /glob
parent5d996bf28d5dfd42415fbcafa55235f632313839 (diff)
downloadmake-b65a552aed31768254b00479637a241571af3f8d.tar.gz
glob/glob.c [__GNU_LIBRARY__ && __DJGPP__]: Add a realloc declaration
that matches the one in the DJGPP libc.
Diffstat (limited to 'glob')
-rw-r--r--glob/ChangeLog5
-rw-r--r--glob/glob.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/glob/ChangeLog b/glob/ChangeLog
index a1136233..a6675e05 100644
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-22 Juan Manuel Guerrero <juan.guerrero@gmx.de> (tiny change)
+
+ * glob/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>
* glob.c (my_malloc) [WINDOWS32]: Provide a full ISO C prototype,
diff --git a/glob/glob.c b/glob/glob.c
index 1f306176..b9063c3c 100644
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -190,12 +190,15 @@ __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)
char *p;
unsigned int n;
-# endif
+# endif
{
/* These casts are the for sake of the broken Ultrix compiler,
which warns of illegal pointer combinations otherwise. */