[BACK]Return to ox_launch.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/ox_launch.c between version 1.24 and 1.25

version 1.24, 2011/02/06 07:07:39 version 1.25, 2015/08/06 10:01:52
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.23 2010/09/01 08:01:09 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.24 2011/02/06 07:07:39 ohara Exp $
 */  */
 #include <setjmp.h>  #include <setjmp.h>
 #include <signal.h>  #include <signal.h>
Line 52 
Line 52 
 #include "ca.h"  #include "ca.h"
 #include "com.h"  #include "com.h"
 #include "ox.h"  #include "ox.h"
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) || defined(__MINGW32__) || defined(__MINGW64__)
 #include <stdlib.h>  #include <stdlib.h>
 #include <windows.h>  #include <windows.h>
 #include <io.h>  #include <io.h>
Line 69 
Line 69 
 #include <unistd.h>  #include <unistd.h>
 #endif  #endif
   
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 HANDLE hIntr,hReset,hKill;  HANDLE hIntr,hReset,hKill;
   extern int _fileinfo;
 #endif  #endif
   
 static void put_log(char *);  static void put_log(char *);
Line 117  void launch_main(argc,argv)
Line 118  void launch_main(argc,argv)
 int argc;  int argc;
 char **argv;  char **argv;
 {  {
 #if !defined(VISUAL)  #if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
         Obj p;          Obj p;
         char *name;          char *name;
         char buf[BUFSIZ];          char buf[BUFSIZ];
Line 142  char **argv;
Line 143  char **argv;
         dname = argv[6];          dname = argv[6];
         nolog = argc > 7 ? argv[7]: 0;          nolog = argc > 7 ? argv[7]: 0;
   
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
                 init_socket();                  init_socket();
 #endif  #endif
   
Line 198  char **argv;
Line 199  char **argv;
         }          }
 }  }
   
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 static void do_cmd(cmd)  static void do_cmd(cmd)
 int cmd;  int cmd;
 {  {
Line 262  int bs;
Line 263  int bs;
 char *dname;  char *dname;
 char *nolog;  char *nolog;
 {  {
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
         char *av[BUFSIZ];          char *av[BUFSIZ];
         char sock_id[BUFSIZ],ox_intr[BUFSIZ],ox_reset[BUFSIZ],ox_kill[BUFSIZ];          char sock_id[BUFSIZ],ox_intr[BUFSIZ],ox_reset[BUFSIZ],ox_kill[BUFSIZ];
         char AsirExe[BUFSIZ];          char AsirExe[BUFSIZ];
Legend:
Removed from v.1.24  
changed lines
  Added in v.1.25
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>