=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/d-itv.c,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- OpenXM_contrib2/asir2000/engine/d-itv.c 2002/01/08 04:14:37 1.2 +++ OpenXM_contrib2/asir2000/engine/d-itv.c 2016/06/29 08:16:11 1.7 @@ -1,11 +1,11 @@ /* - * $OpenXM: OpenXM_contrib2/asir2000/engine/d-itv.c,v 1.1 2000/12/22 10:03:28 saito Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/d-itv.c,v 1.6 2015/08/14 13:51:54 fujimoto Exp $ */ #if defined(INTERVAL) #include #include "ca.h" #include "base.h" -#if PARI +#if defined(PARI) #include "genpari.h" #endif @@ -94,7 +94,7 @@ double NatToRealUp(N a, int *expo) #ifdef vax t = m[0]; m[0] = m[1]; m[1] = t; itod(m); #endif -#if defined(MIPSEL) || defined(TOWNS) || defined(linux) || defined(__alpha) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(MIPSEL) || defined(TOWNS) || defined(linux) || defined(__alpha) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(ANDROID) t = m[0]; m[0] = m[1]; m[1] = t; #endif return *((double *)m); @@ -124,7 +124,7 @@ static double Q2doubleDown(Q a) #ifdef vax s = p[0]; p[0] = p[1]; p[1] = s; itod(p); #endif -#if defined(MIPSEL) || defined(TOWNS) || defined(linux) || defined(__alpha) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(MIPSEL) || defined(TOWNS) || defined(linux) || defined(__alpha) || defined(__FreeBSD__) || defined(__NetBSD__) | defined(ANDROID) s = p[0]; p[0] = p[1]; p[1] = s; #endif FPMINUSINF @@ -161,7 +161,7 @@ static double Q2doubleUp(Q a) #ifdef vax s = p[0]; p[0] = p[1]; p[1] = s; itod(p); #endif -#if defined(MIPSEL) || defined(TOWNS) || defined(linux) || defined(__alpha) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(MIPSEL) || defined(TOWNS) || defined(linux) || defined(__alpha) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(ANDROID) s = p[0]; p[0] = p[1]; p[1] = s; #endif #if 0 @@ -492,13 +492,8 @@ void pwritvd(Num a, Num e, IntervalDouble *c) pwrnum(0,a,e,c); #endif } else if ( !INT(e) ) { -#if PARI && 0 - GEN pa,pe,z; - int ltop,lbot; - - ltop = avma; ritopa(a,&pa); ritopa(e,&pe); lbot = avma; - z = gerepile(ltop,lbot,gpui(pa,pe,prec)); - patori(z,c); cgiv(z); +#if defined(PARI) && 0 + gpui_ri((Obj)a,(Obj)c,(Obj *)c); #else error("pwritvd : can't calculate a fractional power"); #endif