===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.17
retrieving revision 1.20
diff -u -p -r1.17 -r1.20
--- OpenXM_contrib2/asir2000/parse/eval.c	2001/12/21 08:23:15	1.17
+++ OpenXM_contrib2/asir2000/parse/eval.c	2003/02/14 22:29:18	1.20
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.16 2001/10/09 01:36:24 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.19 2002/12/11 10:54:12 saito Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -54,11 +54,11 @@
 #include "parse.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
-extern jmp_buf timer_env;
+extern JMP_BUF timer_env;
 
 int f_break,f_return,f_continue;
 int evalstatline;
@@ -182,7 +182,7 @@ pointer eval(FNODE f)
 				expired = (Obj)eval((FNODE)FA2(f));
 				set_timer(interval);
 				savepvs();
-				if ( !setjmp(timer_env) )
+				if ( !SETJMP(timer_env) )
 					val = eval((FNODE)FA1(f));
 				else {
 					val = (pointer)expired;
@@ -350,13 +350,13 @@ pointer evalstat(SNODE f)
 		case S_BP:
 			if ( !nextbp && (!FA1(f) || eval((FNODE)FA1(f))) ) {
 				if ( (FNODE)FA2(f) ) {
-#if PARI
+#if defined(PARI)
 					pari_outfile = stderr;
 #endif
 					asir_out = stderr;
 					printexpr(CO,eval((FNODE)FA2(f)));
 					putc('\n',asir_out); fflush(asir_out);
-#if PARI
+#if defined(PARI)
 					pari_outfile = stdout;
 #endif
 					asir_out = stdout;
@@ -456,7 +456,7 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 	NODE tn,sn,opts,opt1;
     VS pvs;
 	char errbuf[BUFSIZ];
-	static int stack_size;
+	static unsigned int stack_size;
 	static void *stack_base;
 
 	if ( f->id == A_UNDEF ) {