===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v
retrieving revision 1.21
retrieving revision 1.26
diff -u -p -r1.21 -r1.26
--- OpenXM_contrib2/asir2000/io/ox_launch.c	2006/09/26 05:35:26	1.21
+++ OpenXM_contrib2/asir2000/io/ox_launch.c	2015/08/14 13:51:55	1.26
@@ -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_launch.c,v 1.20 2004/06/15 09:04:41 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.25 2015/08/06 10:01:52 fujimoto Exp $ 
 */
 #include <setjmp.h>
 #include <signal.h>
@@ -52,7 +52,7 @@
 #include "ca.h"
 #include "com.h"
 #include "ox.h"
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <stdlib.h>
 #include <windows.h>
 #include <io.h>
@@ -69,8 +69,9 @@
 #include <unistd.h>
 #endif
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 HANDLE hIntr,hReset,hKill;
+extern int _fileinfo;
 #endif
 
 static void put_log(char *);
@@ -117,7 +118,7 @@ void launch_main(argc,argv)
 int argc;
 char **argv;
 {
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	Obj p;
 	char *name;
 	char buf[BUFSIZ];
@@ -142,7 +143,7 @@ char **argv;
 	dname = argv[6];
 	nolog = argc > 7 ? argv[7]: 0;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 		init_socket();
 #endif
 
@@ -198,7 +199,7 @@ char **argv;
 	}
 }
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 static void do_cmd(cmd)
 int cmd;
 {
@@ -262,7 +263,7 @@ int bs;
 char *dname;
 char *nolog;
 {
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	char *av[BUFSIZ];
 	char sock_id[BUFSIZ],ox_intr[BUFSIZ],ox_reset[BUFSIZ],ox_kill[BUFSIZ];
 	char AsirExe[BUFSIZ];
@@ -274,7 +275,7 @@ char *nolog;
 	DuplicateHandle(GetCurrentProcess(),(HANDLE)bs,
 					GetCurrentProcess(),(HANDLE *)&newbs,
 					0,TRUE,DUPLICATE_SAME_ACCESS);
-	close(bs);
+	closesocket(bs);
 	bs = newbs;
 
 	mypid = GetCurrentProcessId();
@@ -299,7 +300,9 @@ char *nolog;
 		Pget_rootdir(&rootdir);
 		sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));
 	}
+#if _MSC_VER < 1400
 	_fileinfo = 1;
+#endif
 	hProc = _spawnv(_P_NOWAIT,AsirExe,av);
 	return (int)hProc;
 #else /* VISUAL */
@@ -336,7 +339,7 @@ char *nolog;
 #endif
 		}
 		if ( !nolog && !strcmp(dname,"1" ) ) /* XXX: for ssh */
-			execl(prog,prog,0);
+			execl(prog,prog,(char *)0);
 		else if ( nolog || !strcmp(dname,"0") ) {
 			FILE *null;
 
@@ -346,15 +349,15 @@ char *nolog;
 			if ( !strcmp(dname,"1") ) {
 				/* XXX */
 				putenv("DISPLAY=");
-				execl(prog,prog,0);
+				execl(prog,prog,(char *)0);
 			} else if ( strcmp(dname,"0") )
-				execl(prog,prog,"-display",dname,0);
+				execl(prog,prog,"-display",dname,(char *)0);
 			else {
 				putenv("DISPLAY=");
-				execl(prog,prog,0);
+				execl(prog,prog,(char *)0);
 			}
 		} else
-			execl(prog,prog,"-display",dname,0);
+			execl(prog,prog,"-display",dname,(char *)0);
 		/* On failure */
 		errcode = 2;
 		write(4,&errcode,1);