===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -p -r1.10 -r1.14
--- OpenXM_contrib2/asir2000/parse/main.c	2001/08/20 09:03:28	1.10
+++ OpenXM_contrib2/asir2000/parse/main.c	2001/12/27 07:51:17	1.14
@@ -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.9 2000/12/22 10:03:32 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.13 2001/12/25 02:39:06 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,10 +53,11 @@
 #if PARI
 #include "genpari.h"
 
+/* XXX : environment is defined in libpari.a */
 extern jmp_buf environnement;
 #endif
 
-extern jmp_buf main_env;
+extern JMP_BUF main_env;
 
 #if defined(INTERVAL)
 #ifndef ASIRRCNAME
@@ -70,22 +71,19 @@ extern jmp_buf main_env;
 
 
 double get_current_time();
+void init_socket();
+void recover();
+
 extern int mpi_nprocs,mpi_myid;
 
-#if MPI
-int *StackBottom;
-#endif
-
 #if defined(VISUAL_LIB)
-void Main(argc,argv)
+void Main(int argc,char *argv[])
 #else
 #if defined(VISUAL)
 void
 #endif
-main(argc,argv)
+main(int argc,char *argv[])
 #endif
-int argc;
-char *argv[];
 {
 	int tmp;
 	FILE *ifp;
@@ -95,13 +93,16 @@ char *argv[];
 	extern int do_asirrc;
 	extern int do_file;
 	extern FILE *in_fp;
+	extern int *StackBottom;
 	char *getenv();
 	char *homedir;
-	char *slash,*binname;
 	char *ptr;
+#if !defined(VISUAL)
+	char *slash,*binname;
+#endif
 
-#if MPI
 	StackBottom = &tmp;
+#if MPI
 	mpi_init();
 	if ( mpi_myid ) {
 		int slave_argc;
@@ -182,7 +183,7 @@ char *argv[];
 
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(main_env) ) {
+		if ( !SETJMP(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;
@@ -198,12 +199,13 @@ char *argv[];
 	while ( 1 ) {
 #if PARI
 		recover(0);
+		/* XXX environement is defined in libpari.a */
 		if ( setjmp(environnement) ) {
 			avma = top; recover(1);
 			resetenv("");
 		}
 #endif
-		if ( setjmp(main_env) )
+		if ( SETJMP(main_env) )
 			prompt();
 		read_eval_loop();
 	}
@@ -212,8 +214,6 @@ char *argv[];
 #if !defined(VISUAL_LIB)
 /* a dummy function */
 
-void set_error(code,reasion,action)
-int code;
-char *reasion,*action;
+void set_error(int code,char *reason,char *action)
 {}
 #endif