===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cpexpr.c,v
retrieving revision 1.13
retrieving revision 1.16
diff -u -p -r1.13 -r1.16
--- OpenXM_contrib2/asir2000/io/cpexpr.c	2001/10/09 01:36:20	1.13
+++ OpenXM_contrib2/asir2000/io/cpexpr.c	2003/12/25 02:40:24	1.16
@@ -44,12 +44,15 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.12 2001/09/03 07:01:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.15 2003/02/14 22:29:15 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "al.h"
 #include "base.h"
+#if PARI
+#include "genpari.h"
+#endif
 
 extern int hex_output,fortran_output,double_output,real_digit;
 
@@ -127,11 +130,10 @@ int estimate_length(VL vl,pointer p)
 	return total_length;
 }
 
-#if PARI
+#if defined(PARI)
 void PRINTBF(BF a)
 {
 	char *str;
-	char *GENtostr();
 	char *GENtostr0();
 	void myoutbrute();
 
@@ -228,7 +230,7 @@ void PRINTNUM(Num q)
 		case N_A:
 			PUTS("("); PRINTR(ALG,(R)BDY((Alg)q)); PUTS(")");
 			break;
-#if PARI
+#if defined(PARI)
 		case N_B:
 			PRINTBF((BF)q); break;
 #endif
@@ -338,8 +340,8 @@ void PRINTV(VL vl,V v)
 	else if ( (vid)v->attr == V_PF ) {
 		pf = ((PFINS)v->priv)->pf; ad = ((PFINS)v->priv)->ad;
 		if ( !strcmp(NAME(pf),"pow") ) {
-			PUTS("("); PRINTR(vl,(R)ad[0].arg); PUTS(")"); PRINTHAT; PUTS("(");
-			PRINTR(vl,(R)ad[1].arg); PUTS(")");
+			PUTS("(("); PRINTR(vl,(R)ad[0].arg); PUTS(")"); PRINTHAT; PUTS("(");
+			PRINTR(vl,(R)ad[1].arg); PUTS("))");
 		} else if ( !pf->argc )
 			PUTS(NAME(pf));
 		else {