aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2004-02-17 02:11:39 +0000
committerDJ Delorie <dj@redhat.com>2004-02-17 02:11:39 +0000
commitf937530551ba8561aed3e15538bb1803e99f2ee8 (patch)
tree7a28ab0ca296e9a24cad9641d9d7bc71bd177f45
parent5f51a1247057ddae9da3c175cd76f6ccb0cb74a1 (diff)
downloadgdb-f937530551ba8561aed3e15538bb1803e99f2ee8.zip
gdb-f937530551ba8561aed3e15538bb1803e99f2ee8.tar.gz
gdb-f937530551ba8561aed3e15538bb1803e99f2ee8.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/regex.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 10c7f46..08b7d5b 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-16 Matt Kraai <kraai@alumni.cmu.edu>
+
+ * regex.c: Include <ansidecl.h>.
+ (regcomp): Cast i to int.
+ (regerror): Add ATTRIBUTE_UNUSED to parameter preg.
+
2004-01-25 Ian Lance Taylor <ian@wasabisystems.com>
* configure.ac: Add m4_pattern_allow(LIBOBJS).
diff --git a/libiberty/regex.c b/libiberty/regex.c
index e3439b2..522b0ee 100644
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -36,6 +36,8 @@
# include <config.h>
#endif
+#include <ansidecl.h>
+
#ifndef PARAMS
# if defined __GNUC__ || (defined __STDC__ && __STDC__)
# define PARAMS(args) args
@@ -8040,7 +8042,7 @@ regcomp (preg, pattern, cflags)
/* Map uppercase characters to corresponding lowercase ones. */
for (i = 0; i < CHAR_SET_SIZE; i++)
- preg->translate[i] = ISUPPER (i) ? TOLOWER (i) : i;
+ preg->translate[i] = ISUPPER (i) ? TOLOWER (i) : (int) i;
}
else
preg->translate = NULL;
@@ -8175,7 +8177,7 @@ weak_alias (__regexec, regexec)
size_t
regerror (errcode, preg, errbuf, errbuf_size)
int errcode;
- const regex_t *preg;
+ const regex_t *preg ATTRIBUTE_UNUSED;
char *errbuf;
size_t errbuf_size;
{