===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.24
retrieving revision 1.27
diff -u -p -r1.24 -r1.27
--- OpenXM_contrib2/asir2000/parse/main.c	2004/01/07 06:25:42	1.24
+++ OpenXM_contrib2/asir2000/parse/main.c	2004/06/15 00:56:52	1.27
@@ -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/main.c,v 1.23 2003/12/23 06:30:14 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.26 2004/03/05 02:26:53 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -54,7 +54,9 @@
 #include "genpari.h"
 
 /* XXX : environment is defined in libpari.a */
+#  if !(PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;
+#  endif
 #endif
 
 extern JMP_BUF main_env;
@@ -104,6 +106,7 @@ main(int argc,char *argv[])
 #endif
 
 	StackBottom = &tmp;
+	GC_init();
 #if defined(MPI)
 	mpi_init();
 	if ( mpi_myid ) {
@@ -151,7 +154,6 @@ main(int argc,char *argv[])
 	rtime_init();
 	env_init();
 	endian_init();
-	GC_init();
 	cppname_init();
 	process_args(--argc,++argv);
 #if defined(PARI)
@@ -170,6 +172,8 @@ main(int argc,char *argv[])
 	pf_init();
 	sysf_init();
 	parif_init();
+	order_init();
+	/* XXX set the default ordering */
 #if defined(VISUAL)
 	init_socket();
 #endif
@@ -220,10 +224,12 @@ main(int argc,char *argv[])
 #if defined(PARI)
 		recover(0);
 		/* XXX environement is defined in libpari.a */
+#  if !(PARI_VERSION_CODE > 131588)
 		if ( setjmp(environnement) ) {
 			avma = top; recover(1);
 			resetenv("");
 		}
+#  endif
 #endif
 		if ( SETJMP(main_env) )
 			prompt();