===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.39
retrieving revision 1.41
diff -u -p -r1.39 -r1.41
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2002/02/25 06:47:39	1.39
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2003/02/14 22:29:15	1.41
@@ -44,14 +44,14 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.38 2002/02/25 06:39:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.40 2002/08/02 02:28:27 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "signal.h"
 #include "ox.h"
 #include "version.h"
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
@@ -78,7 +78,7 @@ Obj *asir_OperandStack;
 int asir_OperandStackPtr = -1;
 
 void ox_io_init();
-void ox_asir_init(int,char **);
+void ox_asir_init(int,char **,char *);
 Obj asir_pop_one();
 Obj asir_peek_one();
 void asir_push_one(Obj);
@@ -98,7 +98,7 @@ char *name_of_id(int);
 static void asir_do_cmd(int,unsigned int);
 static void asir_executeFunction(int);
 
-#if MPI
+#if defined(MPI)
 /* XXX : currently MPI version supports only a homogeneous cluster. */
 
 extern int mpi_nprocs,mpi_myid;
@@ -140,7 +140,7 @@ void ox_main(int argc,char **argv) {
 	int ret;
 	extern char LastError[];
 
-	ox_asir_init(argc,argv);
+	ox_asir_init(argc,argv,"ox_asir");
 	if ( do_message )
 		fprintf(stderr,"I'm an ox_asir, Version %d.\n",ASIR_VERSION);
 	if ( SETJMP(ox_env) ) {
@@ -487,7 +487,7 @@ int asir_executeString()
 	SNODE snode;
 	pointer val;
 	char *cmd;
-#if PARI
+#if defined(PARI)
 	recover(0);
 	/* environement is defined in libpari.a */
 	if ( setjmp(environnement) ) {
@@ -636,7 +636,7 @@ Obj asir_peek_one() {
 	}
 }
 
-void ox_asir_init(int argc,char **argv)
+void ox_asir_init(int argc,char **argv,char *servername)
 {
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
@@ -653,11 +653,11 @@ void ox_asir_init(int argc,char **argv)
 	int tmp;
 #endif
 
-#if !defined(VISUAL) && !MPI
+#if !defined(VISUAL) && !defined(MPI)
 	do_server_in_X11 = 1; /* XXX */
 #endif
 	asir_save_handler();
-#if PARI
+#if defined(PARI)
 	risa_pari_init();
 #endif
 	srandom((int)get_current_time());
@@ -712,7 +712,7 @@ void ox_asir_init(int argc,char **argv)
 	input_init(0,"string");
 /* XXX Windows compatibility */
 	ox_io_init();
-	create_my_mathcap("ox_asir");
+	create_my_mathcap(servername);
 }
 
 void ox_io_init() {
@@ -941,11 +941,11 @@ int asir_ox_init(int byteorder)
 	static ox_asir_initialized = 0;
 	FILE *ifp;
 
-#if !defined(VISUAL) && !MPI
+#if !defined(VISUAL) && !defined(MPI)
 	do_server_in_X11 = 0; /* XXX */
 #endif
 	asir_save_handler();
-#if PARI
+#if defined(PARI)
 	risa_pari_init();
 #endif
 	srandom((int)get_current_time());