diff options
| author | ache <ache@FreeBSD.org> | 2003-08-03 04:36:09 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2003-08-03 04:36:09 +0000 |
| commit | 9b6751c3cce721fd07356de01ef4cf23f9f6f2b0 (patch) | |
| tree | 68938fbabfbd36a0fb6b3a5ca4d72cb2bbca509d /gnu | |
| parent | df9eb04e4072f01abe16a42a09e201621c88bbec (diff) | |
| download | FreeBSD-src-9b6751c3cce721fd07356de01ef4cf23f9f6f2b0.zip FreeBSD-src-9b6751c3cce721fd07356de01ef4cf23f9f6f2b0.tar.gz | |
Remove collate_range_cmp() stabilization, it conflicts with ranges
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libregex/regex.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gnu/lib/libregex/regex.c b/gnu/lib/libregex/regex.c index 335e5d3..fe52373 100644 --- a/gnu/lib/libregex/regex.c +++ b/gnu/lib/libregex/regex.c @@ -19,6 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* $FreeBSD$ */ + /* AIX requires this to be the first thing in the file. */ #if defined (_AIX) && !defined (REGEX_MALLOC) #pragma alloca @@ -1114,19 +1116,14 @@ static boolean group_in_compile_stack _RE_ARGS((compile_stack_type regnum_t regnum)); #ifdef __FreeBSD__ -static int collate_range_cmp (a, b) +static int collate_range_cmp(a, b) int a, b; { - int r; static char s[2][2]; - if ((unsigned char)a == (unsigned char)b) - return 0; s[0][0] = a; s[1][0] = b; - if ((r = strcoll(s[0], s[1])) == 0) - r = (unsigned char)a - (unsigned char)b; - return r; + return (strcoll(s[0], s[1])); } #endif |
