diff options
| author | ache <ache@FreeBSD.org> | 1996-08-12 19:04:24 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1996-08-12 19:04:24 +0000 |
| commit | 62d22e65bdcc1a114ff10a64c5d89c2bda26339b (patch) | |
| tree | 502d3ea776c2668f4d3c601fd36e85d700a3e416 /gnu/lib/libregex | |
| parent | ffcd81205d69b9483f54a151cb05bd31e5bb190c (diff) | |
| download | FreeBSD-src-62d22e65bdcc1a114ff10a64c5d89c2bda26339b.zip FreeBSD-src-62d22e65bdcc1a114ff10a64c5d89c2bda26339b.tar.gz | |
Convert to newly aded collate compare function
Diffstat (limited to 'gnu/lib/libregex')
| -rw-r--r-- | gnu/lib/libregex/Makefile | 5 | ||||
| -rw-r--r-- | gnu/lib/libregex/regex.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile index dc2b75d..98c3f2d 100644 --- a/gnu/lib/libregex/Makefile +++ b/gnu/lib/libregex/Makefile @@ -1,9 +1,8 @@ -# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.15 1995/08/06 12:23:01 bde Exp $ +# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.16 1996/08/12 18:03:53 ache Exp $ LIB= gnuregex -CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../../lib/libc/locale \ - -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 +CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 SRCS= regex.c NOMAN= noman diff --git a/gnu/lib/libregex/regex.c b/gnu/lib/libregex/regex.c index 7f4b0ae..956d2f5 100644 --- a/gnu/lib/libregex/regex.c +++ b/gnu/lib/libregex/regex.c @@ -126,7 +126,7 @@ init_syntax_once () #endif /* not emacs */ #ifdef __FreeBSD__ -#include "collate.h" +#include <locale.h> #endif /* Get the interface, including the syntax bits. */ @@ -2320,7 +2320,7 @@ compile_range (p_ptr, pend, translate, syntax, b) /* If the start is after the end, the range is empty. */ #ifdef __FreeBSD__ - if (__collcmp (range_start, range_end) > 0) + if (collate_range_cmp (range_start, range_end) > 0) #else if (range_start > range_end) #endif @@ -2328,8 +2328,8 @@ compile_range (p_ptr, pend, translate, syntax, b) #ifdef __FreeBSD__ for (this_char = 0; this_char < 1 << BYTEWIDTH; this_char++) - if ( __collcmp(range_start, this_char) <= 0 - && __collcmp(this_char, range_end) <= 0 + if ( collate_range_cmp (range_start, this_char) <= 0 + && collate_range_cmp (this_char, range_end) <= 0 ) { SET_LIST_BIT (TRANSLATE (this_char)); } |
