===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/asir_sm.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2000/parse/asir_sm.c	2000/11/14 08:38:40	1.4
+++ OpenXM_contrib2/asir2000/parse/asir_sm.c	2004/06/15 00:56:52	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_sm.c,v 1.3 2000/08/22 05:04:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/asir_sm.c,v 1.6 2004/02/13 05:48:36 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,10 +53,11 @@
 #include <console.h>
 #endif
 
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
-
+#  if !(PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;
+#  endif
 #endif
 
 extern jmp_buf env;
@@ -82,6 +83,7 @@ Asir_Start()
 	asir_save_handler();
 	if ( ox_asir_initialized )
 		return;
+	GC_init();
 	ox_asir_initialized = 1;
 	ox_do_copy = 1;
 #if defined(THINK_C)
@@ -96,7 +98,6 @@ Asir_Start()
 #if defined(TOWNS) && !defined(GO32) && !defined(__WIN32__)
 	disable_ctrl_c();
 #endif
-	GC_init();
 /*	process_args(argc,argv); */
 #if 0
 	copyright();
@@ -145,17 +146,19 @@ char *s;
 {
 	SNODE snode;
 	pointer val;
-#if PARI
+#if defined(PARI)
 	static long tloc,listloc;
 	extern long avloc;
 
 	Asir_Start();
 	asir_set_handler();
 	avloc = avma; tloc = tglobal; listloc = marklist();
+#  if !(PARI_VERSION_CODE > 131588)
 	if ( setjmp(environnement) ) {
 		avma = avloc; tglobal = tloc; recover(listloc);
 		resetenv("");
 	}
+#  endif
 #endif
 	if ( setjmp(env) ) {
 		asir_reset_handler();