===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/t-itv.c,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -p -r1.1 -r1.4
--- OpenXM_contrib2/asir2000/engine/t-itv.c	2000/12/22 10:03:28	1.1
+++ OpenXM_contrib2/asir2000/engine/t-itv.c	2003/10/20 07:18:42	1.4
@@ -1,10 +1,10 @@
 /*
- * $OpenXM: $
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/t-itv.c,v 1.3 2003/02/14 22:29:09 ohara Exp $
 */
 #if defined(INTERVAL)
 #include "ca.h"
 #include "base.h"
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
@@ -50,7 +50,7 @@ void additvp(Itv a, Itv b, Itv *c)
 		addnum(0,a,b,c);
 	else if ( (NID(a) == N_IP) && (NID(b) == N_R ) 
 		||(NID(a) == N_R ) && (NID(b) == N_IP) )
-		additvd((Num)a,(Num)b,(ItvD *)c);
+		additvd((Num)a,(Num)b,(IntervalDouble *)c);
 	else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
@@ -73,7 +73,7 @@ void subitvp(Itv a, Itv b, Itv *c)
 		subnum(0,a,b,c);
 	else if ( (NID(a) == N_IP) && (NID(b) == N_R ) 
 		||(NID(a) == N_R ) && (NID(b) == N_IP) )
-		subitvd((Num)a,(Num)b,(ItvD *)c);
+		subitvd((Num)a,(Num)b,(IntervalDouble *)c);
 	else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
@@ -94,7 +94,7 @@ void mulitvp(Itv a, Itv b, Itv *c)
 		mulnum(0,a,b,c);
 	else if ( (NID(a) == N_IP) && (NID(b) == N_R ) 
 		||(NID(a) == N_R ) && (NID(b) == N_IP) )
-		mulitvd((Num)a,(Num)b,(ItvD *)c);
+		mulitvd((Num)a,(Num)b,(IntervalDouble *)c);
 	else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
@@ -176,7 +176,7 @@ void divitvp(Itv a, Itv b, Itv *c)
 		divnum(0,a,b,c);
 	else if ( (NID(a) == N_IP) && (NID(b) == N_R ) 
 		||(NID(a) == N_R ) && (NID(b) == N_IP) )
-		divitvd((Num)a,(Num)b,(ItvD *)c);
+		divitvd((Num)a,(Num)b,(IntervalDouble *)c);
 	else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
@@ -227,7 +227,7 @@ void pwritvp(Itv a, Num e, Itv *c)
 	else if ( NID(a) <= N_B )
 		pwrnum(0,a,e,c);
 	else if ( !INT(e) ) {
-#if PARI && 0
+#if defined(PARI) && 0
 		GEN pa,pe,z;
 		int ltop,lbot;
 
@@ -330,7 +330,6 @@ void miditvp(Itv a, Num *b)
 {
 	Num	ai,as;
 	Num	t;
-	Q	TWO;
 
 	if ( ! a ) *b = 0;
 	else if ( (NID(a) <= N_B) )