===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/wsio.h,v
retrieving revision 1.2
retrieving revision 1.10
diff -u -p -r1.2 -r1.10
--- OpenXM_contrib2/asir2000/include/wsio.h	2000/08/21 08:31:36	1.2
+++ OpenXM_contrib2/asir2000/include/wsio.h	2018/03/29 01:32:53	1.10
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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.1.1.1 1999/12/03 07:39:11 noro 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)
-#include <winsock.h>
-#elif MPI
+#if defined(VISUAL) || defined(__MINGW32__)
+#include <winsock2.h>
+#elif defined(MPI)
 #include <sys/types.h>
 #include <mpi.h>
 #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 *);