=================================================================== RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v retrieving revision 1.30 retrieving revision 1.32 diff -u -p -r1.30 -r1.32 --- OpenXM/src/util/ox_pathfinder.c 2006/01/26 08:36:50 1.30 +++ OpenXM/src/util/ox_pathfinder.c 2015/08/03 20:56:50 1.32 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.29 2006/01/10 11:52:56 takayama Exp $ */ +/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.31 2010/08/30 04:17:17 takayama Exp $ */ /* Moved from misc-2003/07/cygwin/test.c */ #include @@ -14,6 +14,8 @@ #include #include "ox_pathfinder.h" +void *sGC_malloc(int); + int OX_P_stdin = -1; int OX_P_stdout = -1; int OX_P_stderr = -1; @@ -40,7 +42,7 @@ static int NoX = 0; static int ErrorVerbose = 1; static int EngineLogToStdout = 0; -#define nomemory(a) {fprintf(stderr,"(%d) no more memory.\n",a);exit(10);} +#define nomemory(a) {fprintf(stderr,"(%p) no more memory.\n",(void *)a);exit(10);} #define mymalloc(a) sGC_malloc(a) void pathFinderErrorVerbose(int k) { @@ -572,7 +574,11 @@ char *cygwinPathToWinPath(char *s) { } if (ans[0] == '/') { +#if defined(__CYGWIN64__) + strcpy(ans,"C:\\cygwin64"); +#else strcpy(ans,"C:\\cygwin"); +#endif strcat(ans,s); }