=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- OpenXM_contrib2/asir2000/io/ox_launch.c 2015/08/06 10:01:52 1.25 +++ 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.24 2011/02/06 07:07:39 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.25 2015/08/06 10:01:52 fujimoto Exp $ */ #include #include @@ -52,7 +52,7 @@ #include "ca.h" #include "com.h" #include "ox.h" -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) #include #include #include @@ -69,7 +69,7 @@ #include #endif -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) HANDLE hIntr,hReset,hKill; extern int _fileinfo; #endif @@ -118,7 +118,7 @@ void launch_main(argc,argv) int argc; char **argv; { -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) Obj p; char *name; char buf[BUFSIZ]; @@ -143,7 +143,7 @@ char **argv; dname = argv[6]; nolog = argc > 7 ? argv[7]: 0; -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) init_socket(); #endif @@ -199,7 +199,7 @@ char **argv; } } -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) static void do_cmd(cmd) int cmd; { @@ -263,7 +263,7 @@ int bs; char *dname; char *nolog; { -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) char *av[BUFSIZ]; char sock_id[BUFSIZ],ox_intr[BUFSIZ],ox_reset[BUFSIZ],ox_kill[BUFSIZ]; char AsirExe[BUFSIZ];