d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert to newly aded collate compare function

Browse Source
This commit is contained in:
Andrey A. Chernov 1996-08-12 19:04:24 +00:00
parent acd9f20695
commit 38378332f6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/lib/libregex/Makefile
View File

@ -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

8
gnu/lib/libregex/regex.c
View File

@ -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));
}