===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/asir_lib.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2000/parse/asir_lib.c	2000/11/14 08:38:40	1.4
+++ OpenXM_contrib2/asir2000/parse/asir_lib.c	2004/02/13 05:48:36	1.7
@@ -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/asir_lib.c,v 1.3 2000/08/22 05:04:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/asir_lib.c,v 1.6 2003/02/14 22:29:17 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,10 +53,11 @@
 #include <console.h>
 #endif
 
-#if PARI
-#include "genpari.h"
-
+#if defined(PARI)
+#  include "genpari.h"
+#  if !(PARI_VERSION_CODE > 131588 )
 extern jmp_buf environnement;
+#  endif
 #endif
 
 extern jmp_buf env;
@@ -68,7 +69,6 @@ int Call_Asir(char *,pointer *);
 
 void Init_Asir(int argc,char **argv)
 {
-	int tmp;
 	FILE *ifp;
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
@@ -81,7 +81,7 @@ void Init_Asir(int argc,char **argv)
 		return;
 	asirlib_initialized = 1;
 	do_file = 1;
-#if PARI 
+#if defined(PARI)
     risa_pari_init();
 #endif 
 	srandom((int)get_current_time());
@@ -134,12 +134,16 @@ int Call_Asir(char *cmd,pointer *result)
 {
 	SNODE snode;
 	pointer val;
-#if PARI
+#if defined(PARI)
+	void recover(int);
+
 	recover(0);
+#  if !(PARI_VERSION_CODE > 131588)
 	if ( setjmp(environnement) ) {
 		avma = top; recover(1);
 		error("PARI error");
 	}
+#  endif
 #endif
 	if ( setjmp(env) ) {
 		*result = 0;