===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.75
retrieving revision 1.78
diff -u -p -r1.75 -r1.78
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2015/08/08 14:19:42	1.75
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2016/08/24 08:21:03	1.78
@@ -44,7 +44,7 @@
  * 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.74 2015/08/06 10:01:52 fujimoto Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.77 2016/08/24 05:33:58 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -163,19 +163,9 @@ void ox_main(int argc,char **argv) {
 		ox_send_sync(0);
 	}
 	while ( 1 ) {
-		extern int recv_intr;
-
 		serial = ox_recv(0,&id,&obj);
-#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
-		if ( recv_intr ) {
-			if ( recv_intr == 1 ) {
-				recv_intr = 0;
-				int_handler(SIGINT);
-			} else {
-				recv_intr = 0;
-				ox_usr1_handler(0);
-			}
-		}
+#if defined(VISUAL) || defined(__MINGW32__)
+		check_intr();
 #endif
 		if ( do_message )
 			fprintf(stderr,"#%d Got %s",serial,name_of_id(id));
@@ -215,9 +205,6 @@ void ox_main(int argc,char **argv) {
 		if ( do_message )
 			fprintf(stderr,"\n");
 	}
-#if defined(__MINGW32__) || defined(__MINGW64__)
-	fflush(stderr);
-#endif
 }
 
 static void asir_do_cmd(int cmd,unsigned int serial)
@@ -951,12 +938,12 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	extern char displayname[];
 	static ox_asir_initialized = 0;
 	int do_server_sav;
-#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	int tmp;
 #endif
 
 	GC_init();
-#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(MPI)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(MPI)
 	do_server_in_X11 = 1; /* XXX */
 #endif
 	asir_save_handler();
@@ -987,7 +974,7 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	sysf_init();
 	parif_init();
 	order_init();
-#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(VISUAL) || defined(__MINGW32__)
 	init_socket();
 #endif
 #if defined(UINIT)
@@ -1034,7 +1021,7 @@ void ox_io_init() {
 
 	I_am_server = 1;
 	endian_init();
-#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(VISUAL) || defined(__MINGW32__)
 	if ( !ox_sock_id )
 		exit(0);
 	iofp[0].in = WSIO_open(ox_sock_id,"r");
@@ -1047,7 +1034,7 @@ void ox_io_init() {
 	setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ);
 	setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ);
 #endif
-	signal(SIGUSR1,ox_usr1_handler);
+	set_signal(SIGUSR1,ox_usr1_handler);
 #endif
 	asir_OperandStackSize = BUFSIZ;
 	asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));
@@ -1064,7 +1051,7 @@ void ox_io_init() {
 	register_server(0,0,0,-1);
 }
 
-#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 /*
  * Library mode functions
  */
@@ -1233,7 +1220,7 @@ int asir_ox_init(int byteorder)
 	static ox_asir_initialized = 0;
 
 	GC_init();
-#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(MPI)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(MPI)
 	do_server_in_X11 = 0; /* XXX */
 #endif
 	asir_save_handler();
@@ -1258,7 +1245,7 @@ int asir_ox_init(int byteorder)
 	pf_init();
 	sysf_init();
 	parif_init();
-#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(VISUAL) || defined(__MINGW32__)
 	init_socket();
 #endif
 #if defined(UINIT)