merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 10c7f4690e6dbb217e6ad4ee5d38711ffc998af1..08b7d5b6b110581b8823aeb3f181cb6a782a50b5 100644 (file)
--- 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 e3439b2ff634d044cc1d1b1ef95f06035b8de910..522b0eedf442743348c82a3c37b3ac1c54a7134d 100644 (file)
--- 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;
 {