=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/wsio.h,v retrieving revision 1.6 retrieving revision 1.10 diff -u -p -r1.6 -r1.10 --- OpenXM_contrib2/asir2000/include/wsio.h 2003/03/07 03:12:27 1.6 +++ OpenXM_contrib2/asir2000/include/wsio.h 2018/03/29 01:32:53 1.10 @@ -45,37 +45,37 @@ * 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.5 2003/02/14 22:29:14 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/wsio.h,v 1.9 2015/08/14 13:51:55 fujimoto Exp $ */ #ifndef WSIO_H #define WSIO_H -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include -#elif MPI +#elif defined(MPI) #include #include #endif -#if MPI -#define WSIO_STRING_LENGTH (1048576) /* Default size of buffer */ +#if defined(MPI) +#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; + { + FILE fp; + 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 cread (char *, unsigned int, int, STREAM *);