mirror of
https://github.com/9fans/plan9port.git
synced 2025-01-12 11:10:07 +00:00
cmd/sort: Rename kcmp to Kcmp to fix FreeBSD compile error
FreeBSD 14.1 introduced the kcmp(2) system call, which is declaired in unistd.h. This symbol colides with the kcmp function which is local to sort.c and results in a compile time error. Rename kcmp to Kcmp to prevent symbol name collision.
This commit is contained in:
parent
8eb063cffd
commit
a71cf1b9f3
1 changed files with 6 additions and 6 deletions
|
@ -108,7 +108,7 @@ void dokey_gn(Key*, uchar*, uchar*, Field*);
|
|||
void dokey_m(Key*, uchar*, uchar*, Field*);
|
||||
void dokey_r(Key*, uchar*, uchar*, Field*);
|
||||
void done(char*);
|
||||
int kcmp(Key*, Key*);
|
||||
int Kcmp(Key*, Key*);
|
||||
void makemapd(Field*);
|
||||
void makemapm(Field*);
|
||||
void mergefiles(int, int, Biobuf*);
|
||||
|
@ -202,7 +202,7 @@ dofile(Biobuf *b)
|
|||
l = newline(b);
|
||||
if(l == 0)
|
||||
break;
|
||||
n = kcmp(ol->key, l->key);
|
||||
n = Kcmp(ol->key, l->key);
|
||||
if(n > 0 || (n == 0 && args.uflag)) {
|
||||
fprint(2, "sort: -c file not in sort\n"); /**/
|
||||
done("order");
|
||||
|
@ -448,7 +448,7 @@ mergefiles(int t, int n, Biobuf *b)
|
|||
break;
|
||||
for(;;) {
|
||||
l = m->line;
|
||||
if(args.uflag && ok && kcmp(ok, l->key) == 0) {
|
||||
if(args.uflag && ok && Kcmp(ok, l->key) == 0) {
|
||||
free(l->key);
|
||||
free(l);
|
||||
} else {
|
||||
|
@ -467,7 +467,7 @@ mergefiles(int t, int n, Biobuf *b)
|
|||
}
|
||||
m->line = l;
|
||||
m->key = l->key;
|
||||
if(nn > 1 && kcmp(mmp[0]->key, mmp[1]->key) > 0)
|
||||
if(nn > 1 && Kcmp(mmp[0]->key, mmp[1]->key) > 0)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -485,7 +485,7 @@ mergefiles(int t, int n, Biobuf *b)
|
|||
}
|
||||
|
||||
int
|
||||
kcmp(Key *ka, Key *kb)
|
||||
Kcmp(Key *ka, Key *kb)
|
||||
{
|
||||
int n, m;
|
||||
|
||||
|
@ -511,7 +511,7 @@ printout(Biobuf *b)
|
|||
ok = 0;
|
||||
for(n=args.nline; n>0; n--) {
|
||||
l = *lp++;
|
||||
if(args.uflag && ok && kcmp(ok, l->key) == 0)
|
||||
if(args.uflag && ok && Kcmp(ok, l->key) == 0)
|
||||
continue;
|
||||
lineout(b, l);
|
||||
ok = l->key;
|
||||
|
|
Loading…
Reference in a new issue