=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/wsio.h,v retrieving revision 1.5 retrieving revision 1.11 diff -u -p -r1.5 -r1.11 --- OpenXM_contrib2/asir2000/include/wsio.h 2003/02/14 22:29:14 1.5 +++ OpenXM_contrib2/asir2000/include/wsio.h 2018/09/09 08:13:41 1.11 @@ -45,11 +45,11 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/include/wsio.h,v 1.4 2000/11/15 01:20:26 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/wsio.h,v 1.10 2018/03/29 01:32:53 noro Exp $ */ #ifndef WSIO_H #define WSIO_H -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include #elif defined(MPI) #include @@ -57,27 +57,32 @@ #endif #if defined(MPI) -#define WSIO_STRING_LENGTH (1048576) /* Default size of buffer */ +#define WSIO_STRING_LENGTH (1048576) /* Default size of buffer */ #else -#define WSIO_STRING_LENGTH (16384) /* Default size of buffer */ +#define WSIO_STRING_LENGTH (16384) /* Default size of buffer */ #endif -#define WSIO_BUFSIZ WSIO_STRING_LENGTH +#define WSIO_BUFSIZ WSIO_STRING_LENGTH typedef struct - { - FILE fp; - int fildes; - int p; - int read_flag; - int buf_size; - char* buf; - int max_buf_size; - int eof; - int error; - }STREAM; + { +#if defined(VISUAL) + int* _p; +#else + FILE fp; +#endif + int fildes; + int p; + int read_flag; + int buf_size; + char* buf; + int max_buf_size; + int eof; + int error; + }STREAM; STREAM *WSIO_open(int,char *); +int WSIO_fileno(STREAM *); int cread (char *, unsigned int, int, STREAM *); int cwrite (char *, unsigned int, int, STREAM *); int cflush(STREAM *);