===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/asir_lib.c,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- OpenXM_contrib2/asir2000/parse/asir_lib.c	2003/02/14 22:29:17	1.6
+++ OpenXM_contrib2/asir2000/parse/asir_lib.c	2004/06/15 00:56:52	1.8
@@ -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.5 2001/10/09 01:36:23 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/asir_lib.c,v 1.7 2004/02/13 05:48:36 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -54,9 +54,10 @@
 #endif
 
 #if defined(PARI)
-#include "genpari.h"
-
+#  include "genpari.h"
+#  if !(PARI_VERSION_CODE > 131588 )
 extern jmp_buf environnement;
+#  endif
 #endif
 
 extern jmp_buf env;
@@ -78,6 +79,7 @@ void Init_Asir(int argc,char **argv)
 
 	if ( asirlib_initialized )
 		return;
+	GC_init();
 	asirlib_initialized = 1;
 	do_file = 1;
 #if defined(PARI)
@@ -95,7 +97,6 @@ void Init_Asir(int argc,char **argv)
 #if !defined(VISUAL) && !defined(THINK_C)
 /*	check_key(); */
 #endif
-	GC_init();
 	process_args(--argc,++argv);
 	copyright();
 	output_init();
@@ -137,10 +138,12 @@ int Call_Asir(char *cmd,pointer *result)
 	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;