=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v retrieving revision 1.29 retrieving revision 1.35 diff -u -p -r1.29 -r1.35 --- OpenXM_contrib2/asir2000/builtin/file.c 2013/08/20 14:22:33 1.29 +++ OpenXM_contrib2/asir2000/builtin/file.c 2017/06/10 05:32:24 1.35 @@ -45,20 +45,20 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.28 2013/02/15 07:05:49 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.34 2015/08/14 13:51:54 fujimoto Exp $ */ #include "ca.h" #include "parse.h" #include "ox.h" #include "base.h" -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) #include "unistd.h" #endif #if defined(PARI) #include "genpari.h" #endif -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include #include #include @@ -68,6 +68,8 @@ #define R_OK 0x04 #endif +void Psprintf(NODE,STRING *); + void Pget_rootdir(); void Paccess(),Premove_file(); void Pbsave_enc(), Pbload_enc(); @@ -169,7 +171,7 @@ void Popen_file(NODE arg,Q *rp) asir_assert(ARG1(arg),O_STR,"open_file"); fp = fopen(name,BDY((STRING)ARG1(arg))); } else - fp = fopen(name,"r"); + fp = fopen(name,"rb"); } if ( !fp ) { sprintf(errbuf,"open_file : cannot open \"%s\"",name); @@ -506,7 +508,7 @@ void Pbload_cmo(NODE arg,Obj *rp) static struct oSTRING rootdir; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) void get_rootdir(char *name,int len) { LONG ret; @@ -589,7 +591,7 @@ void Pgetpid(Q *rp) { int id; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) id = GetCurrentProcessId(); #else id = getpid(); @@ -699,7 +701,7 @@ void Paccess(NODE arg,Q *rp) *rp = 0; } -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) int process_id() { return GetCurrentProcessId();