From f937530551ba8561aed3e15538bb1803e99f2ee8 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 17 Feb 2004 02:11:39 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 6 ++++++ libiberty/regex.c | 6 ++++-- 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 + + * regex.c: Include . + (regcomp): Cast i to int. + (regerror): Add ATTRIBUTE_UNUSED to parameter preg. + 2004-01-25 Ian Lance Taylor * 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 #endif +#include + #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; { -- 2.7.4