| Ilya Zakharevich on Mon, 5 Mar 2001 15:28:07 -0500 |
[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]
| [PATCH] Name conflict |
The names deflate() inflate() conflict with functions in -lz, which is
needed for -lpng which is needed for gnuplot PNG output (probably for
GIF too).
Enjoy,
Ilya
--- ./src/basemath/polarit2.c-pre Mon Mar 5 15:23:10 2001
+++ ./src/basemath/polarit2.c Mon Mar 5 15:23:42 2001
@@ -1420,7 +1420,7 @@ squff(GEN a, long klim, long hint)
}
GEN
-deflate(GEN x0, long *m)
+gp_deflate(GEN x0, long *m)
{
long d = 0, i, id, lx = lgef(x0)-2;
GEN x = x0 + 2;
@@ -1442,7 +1442,7 @@ deflate(GEN x0, long *m)
}
GEN
-inflate(GEN x0, long d)
+gp_inflate(GEN x0, long d)
{
long i, id, ly, lx = lgef(x0)-2;
GEN x = x0 + 2, z, y;
@@ -1460,7 +1460,7 @@ squff2(GEN x, long klim, long hint)
{
GEN L;
long m;
- x = deflate(x, &m);
+ x = gp_deflate(x, &m);
L = squff(x, klim, hint);
if (m > 1)
{
@@ -1481,7 +1481,7 @@ squff2(GEN x, long klim, long hint)
{
GEN L2 = cgetg(1,t_VEC);
for (i=1; i < lg(L); i++)
- L2 = concatsp(L2, squff(inflate((GEN)L[i], v[k]), klim,hint));
+ L2 = concatsp(L2, squff(gp_inflate((GEN)L[i], v[k]), klim,hint));
L = L2;
}
}