=================================================================== RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v retrieving revision 1.32 retrieving revision 1.35 diff -u -p -r1.32 -r1.35 --- OpenXM/src/util/ox_pathfinder.c 2015/08/03 20:56:50 1.32 +++ OpenXM/src/util/ox_pathfinder.c 2015/09/26 12:40:51 1.35 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.31 2010/08/30 04:17:17 takayama Exp $ */ +/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.34 2015/09/25 01:47:09 takayama Exp $ */ /* Moved from misc-2003/07/cygwin/test.c */ #include @@ -7,7 +7,11 @@ #include #include #include +#if (!defined(__MINGW32__) && !defined(__MINGW64__)) #include +#else +#include <_mingw.h> +#endif #include #include #include @@ -124,6 +128,7 @@ void *sGC_malloc(int s) { return (void *) malloc(s); } #define MYFORKCP_SIZE 100 static int Myforkchildren[MYFORKCP_SIZE]; static int Myforkcp=0; +#if (!defined(__MINGW32__) && !defined(__MINGW64__)) static void myforkwait() { int status; int pid; @@ -234,6 +239,21 @@ int oxForkExecBlocked(char **argv) { exit(3); } } +#else +static void myforkwait() { + fprintf(stderr,"ERROR: myforkwait is not implented in mingw\n"); + return; +} +int oxForkExec(char **argv) { + /* cf. Kan/shell.c */ + fprintf(stderr,"ERROR: oxForkExec is not implented in mingw\n"); + return(-1); +} +int oxForkExecBlocked(char **argv) { + fprintf(stderr,"ERROR: oxForkExecBlocked is not implented in mingw\n"); + return(-1); +} +#endif static int getOStypei() { /* @@ -574,7 +594,9 @@ char *cygwinPathToWinPath(char *s) { } if (ans[0] == '/') { -#if defined(__CYGWIN64__) +#if defined(__MSYS__) && defined(__x86_64__) + strcpy(ans,"C:\\msys64"); +#elif defined(__CYGWIN64__) || (defined(__CYGWIN__) && defined(__x86_64__)) strcpy(ans,"C:\\cygwin64"); #else strcpy(ans,"C:\\cygwin"); @@ -1139,6 +1161,7 @@ int oxDeleteFile(char *fname) { /* This function just kills processes, so if there is a process which uses ox protocol, it is not relevant to use this functions. */ +#if (!defined(__MINGW32__) && !defined(__MINGW64__)) int oxKillAll(void) { int i; int pid; @@ -1153,7 +1176,12 @@ int oxKillAll(void) { Myforkcp = 0; return(0); } - +#else +int oxKillAll(void) { + fprintf(stderr,"ERROR: oxKillAll is not implented in mingw\n"); + return(-1); +} +#endif void ox_pathfinder_quiet(void) { Verbose_get_home = 0; Verbose = 0;