diff options
| author | DJ Delorie <dj@redhat.com> | 2005-07-15 02:00:50 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-07-15 02:00:50 +0000 |
| commit | 4fe190829b7039ff7825bc3a8c7213e3bc90b1a4 (patch) | |
| tree | a09a9bb65412185ae81152f379766b12301a79c4 | |
| parent | a0aae17c638bfc72636a1214a5c9ddacf96d9d43 (diff) | |
| download | fsf-binutils-gdb-4fe190829b7039ff7825bc3a8c7213e3bc90b1a4.zip fsf-binutils-gdb-4fe190829b7039ff7825bc3a8c7213e3bc90b1a4.tar.gz fsf-binutils-gdb-4fe190829b7039ff7825bc3a8c7213e3bc90b1a4.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/regex.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index e2cbeb4..b038eaa 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2005-07-15 Ben Elliston <bje@au.ibm.com> + + * regex.c (TRANSLATE): Cast rhs of ternary expression to char. + 2005-07-12 Ben Elliston <bje@au.ibm.com> * floatformat.c (floatformat_to_double): Add a comment about a diff --git a/libiberty/regex.c b/libiberty/regex.c index b7be99d..951f2d1 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -2,7 +2,9 @@ version 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the internationalization features.) - Copyright (C) 1993-1999, 2000, 2001, 2002 Free Software Foundation, Inc. + + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -1918,7 +1920,7 @@ static reg_errcode_t byte_compile_range (unsigned int range_start, ? (char) translate[(unsigned char) (d)] : (d)) # else /* BYTE */ # define TRANSLATE(d) \ - (translate ? (char) translate[(unsigned char) (d)] : (d)) + (translate ? (char) translate[(unsigned char) (d)] : (char) (d)) # endif /* WCHAR */ # endif |