mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
66 lines
2.1 KiB
Plaintext
66 lines
2.1 KiB
Plaintext
$NetBSD: patch-aa,v 1.4 2015/12/29 23:34:57 dholland Exp $
|
|
|
|
Avoid name conflict with qdiv.
|
|
|
|
--- Numeric.c.orig 1999-02-09 05:05:13.000000000 +0000
|
|
+++ Numeric.c
|
|
@@ -591,7 +591,7 @@ static int mul (bigdig *a, bigdig *b, bi
|
|
return len;
|
|
}
|
|
|
|
-static bigdig qdiv (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la)
|
|
+static bigdig qdiv__ (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la)
|
|
{
|
|
int i;
|
|
bigreg d;
|
|
@@ -1212,11 +1212,11 @@ static void *
|
|
(void) normalize (d, &ld, 0);
|
|
} else if (gcd [0] != 1) {
|
|
PROVIDE_BIGNUM (tmp_n, ln);
|
|
- if (qdiv (n, gcd [0], tmp_n_dig, &r, ln) == 0)
|
|
+ if (qdiv__ (n, gcd [0], tmp_n_dig, &r, ln) == 0)
|
|
--ln;
|
|
n = tmp_n_dig;
|
|
PROVIDE_BIGNUM (tmp_d, ld);
|
|
- if (qdiv (d, gcd [0], tmp_d_dig, &r, ld) == 0)
|
|
+ if (qdiv__ (d, gcd [0], tmp_d_dig, &r, ld) == 0)
|
|
--ld;
|
|
d = tmp_d_dig;
|
|
} else {
|
|
@@ -1939,7 +1939,7 @@ static void *fract_to_int (ScmFraction *
|
|
PROVIDE_BIGNUM (tmp1, a->nlength);
|
|
PROVIDE_BIGNUM (tmp2, 1);
|
|
l1 = a->nlength;
|
|
- qdiv (a->dig, a->dig [a->nlength], tmp1_dig, &rr, a->nlength);
|
|
+ qdiv__ (a->dig, a->dig [a->nlength], tmp1_dig, &rr, a->nlength);
|
|
tmp2_dig [0] = rr;
|
|
(void) normalize (tmp1_dig, &l1, 0);
|
|
r = tmp2_dig;
|
|
@@ -2407,7 +2407,7 @@ static void raw_bigdig_to_ascii_10 (bigd
|
|
bigdig_copy (a, tmp1_dig, la);
|
|
s = strg;
|
|
while (la > 1 || tmp1_dig [0] > 0) {
|
|
- if (qdiv (tmp1_dig, 10000, tmp1_dig, &r, la) == 0)
|
|
+ if (qdiv__ (tmp1_dig, 10000, tmp1_dig, &r, la) == 0)
|
|
--la;
|
|
sprintf (buf, "%04u", (unsigned) r);
|
|
for (i = 3; i >= 0; i--)
|
|
@@ -3116,7 +3116,7 @@ void *ScmParseNumberString (const char *
|
|
provide_parse_buf (l);
|
|
s = parse_buf;
|
|
for (p = 0; p < l; p++)
|
|
- s [p] = tolower (arg [p]);
|
|
+ s [p] = tolower ((unsigned char) arg [p]);
|
|
|
|
/* scanning the prefix */
|
|
if (l > 1 && s [0] == '#') {
|
|
@@ -3312,7 +3312,7 @@ static void big_small_qr (ScmFixnum *a,
|
|
PROVIDE_BIGNUM (tmp1, lq);
|
|
qq = tmp1_dig;
|
|
}
|
|
- if (qdiv (a->dig, bb, qq, &rr, lq) == 0)
|
|
+ if (qdiv__ (a->dig, bb, qq, &rr, lq) == 0)
|
|
--lq;
|
|
if (r != NULL)
|
|
*r = ScmLongToNumber (a->sign ? - (long) rr : rr);
|