=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ws_fileio.c,v retrieving revision 1.6 retrieving revision 1.10 diff -u -p -r1.6 -r1.10 --- OpenXM_contrib2/asir2000/io/ws_fileio.c 2003/03/07 06:39:57 1.6 +++ OpenXM_contrib2/asir2000/io/ws_fileio.c 2015/08/06 10:01:52 1.10 @@ -44,9 +44,9 @@ * 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/ws_fileio.c,v 1.5 2003/03/07 03:12:28 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ws_fileio.c,v 1.9 2009/02/13 11:25:48 ohara Exp $ */ -#if defined(VISUAL) || defined(MPI) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) || defined(MPI) #include #include"wsio.h" @@ -159,10 +159,16 @@ char* mode; rst = (STREAM*)malloc(sizeof(STREAM)); if (rst) { #if defined(VISUAL) +#if _MSC_VER < 1500 _fileno(&rst->fp) = -1; +#else + (&rst->fp)->_file = -1; +#endif #elif defined(MPI) -#if defined(sparc) +#if defined(sparc) || defined(__FreeBSD__) (&rst->fp)->_file = -1; +#elif defined(linux) + (&rst->fp)->_fileno = -1; #else fileno(&rst->fp) = -1; #endif @@ -198,7 +204,7 @@ STREAM* s; if (!s) return 0; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) size = recv(s->fildes,data,count,0); #elif defined(MPI) { @@ -223,7 +229,7 @@ STREAM* s; if (!s || !count) return 0; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) size = send(s->fildes,data,count,0); return size; #elif defined(MPI)