mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-20 15:43:16 +00:00
Remove collate_range_cmp() stabilization, it conflicts with ranges
This commit is contained in:
parent
508f10f7c1
commit
94bfac9e80
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=118375
@ -19,6 +19,8 @@
|
|||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||||
|
|
||||||
|
/* $FreeBSD$ */
|
||||||
|
|
||||||
/* AIX requires this to be the first thing in the file. */
|
/* AIX requires this to be the first thing in the file. */
|
||||||
#if defined (_AIX) && !defined (REGEX_MALLOC)
|
#if defined (_AIX) && !defined (REGEX_MALLOC)
|
||||||
#pragma alloca
|
#pragma alloca
|
||||||
@ -1114,19 +1116,14 @@ static boolean group_in_compile_stack _RE_ARGS((compile_stack_type
|
|||||||
regnum_t regnum));
|
regnum_t regnum));
|
||||||
|
|
||||||
#ifdef __FreeBSD__
|
#ifdef __FreeBSD__
|
||||||
static int collate_range_cmp (a, b)
|
static int collate_range_cmp(a, b)
|
||||||
int a, b;
|
int a, b;
|
||||||
{
|
{
|
||||||
int r;
|
|
||||||
static char s[2][2];
|
static char s[2][2];
|
||||||
|
|
||||||
if ((unsigned char)a == (unsigned char)b)
|
|
||||||
return 0;
|
|
||||||
s[0][0] = a;
|
s[0][0] = a;
|
||||||
s[1][0] = b;
|
s[1][0] = b;
|
||||||
if ((r = strcoll(s[0], s[1])) == 0)
|
return (strcoll(s[0], s[1]));
|
||||||
r = (unsigned char)a - (unsigned char)b;
|
|
||||||
return r;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user