===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/asir_sm.c,v
retrieving revision 1.2
retrieving revision 1.8
diff -u -p -r1.2 -r1.8
--- OpenXM_contrib2/asir2000/parse/asir_sm.c	2000/08/21 08:31:45	1.2
+++ OpenXM_contrib2/asir2000/parse/asir_sm.c	2012/12/17 07:20:45	1.8
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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.1.1.1 1999/12/03 07:39:11 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/asir_sm.c,v 1.7 2004/06/15 00:56:52 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,14 +53,14 @@
 #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;
-extern int *StackBottom;
 extern int ox_do_copy, ox_do_count, ox_count_length;
 extern char *ox_copy_bptr;
 
@@ -83,12 +83,12 @@ Asir_Start()
 	asir_save_handler();
 	if ( ox_asir_initialized )
 		return;
+	GC_init();
 	ox_asir_initialized = 1;
 	ox_do_copy = 1;
 #if defined(THINK_C)
 	param_init();
 #endif
-	StackBottom = &tmp + 1; /* XXX */
 	rtime_init();
 	env_init();
 	endian_init();
@@ -98,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();
@@ -147,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();
@@ -201,7 +202,7 @@ char *Asir_PopString()
 		soutput_init(buf);
 		sprintexpr(CO,val);
 		l = strlen(buf);
-		obuf = (char *)GC_malloc(l+1);
+		obuf = (char *)MALLOC(l+1);
 		strcpy(obuf,buf);
 		return obuf;
 	}
@@ -258,7 +259,7 @@ int *size;
 	saveobj(0,val);
 	*size = ox_count_length;
 	ox_count_length = 0; ox_do_count = 0;
-	ox_copy_bptr = buf = (char *)GC_malloc(*size);
+	ox_copy_bptr = buf = (char *)MALLOC(*size);
 	savevl(0,vl);
 	saveobj(0,val);
 	ox_copy_bptr = 0;