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

Replace collate_range_cmp call with its code (GNU version)

Browse Source
This commit is contained in:
ache 1996-10-31 07:45:15 +00:00
parent 79dc7a08be
commit df9660c066
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/usr.bin/awk/dfa.c
View File

@ -21,9 +21,6 @@
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#ifdef __FreeBSD__
#include <locale.h>
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
@ -121,6 +118,23 @@ static char **comsubs _RE_ARGS((char *left, char *right));
static char **addlists _RE_ARGS((char **old, char **new));
static char **inboth _RE_ARGS((char **left, char **right));
#ifdef __FreeBSD__
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;
}
#endif
static ptr_t
xcalloc(n, s)
size_t n;

20
gnu/usr.bin/grep/dfa.c
View File

@ -21,9 +21,6 @@
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#ifdef __FreeBSD__
#include <locale.h>
#endif
#ifdef STDC_HEADERS
#include <stdlib.h>
@ -68,6 +65,23 @@ typedef char *ptr_t;
static void dfamust();
#ifdef __FreeBSD__
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;
}
#endif
static ptr_t
xcalloc(n, s)
int n;