===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ws_fileio.c,v
retrieving revision 1.2
retrieving revision 1.9
diff -u -p -r1.2 -r1.9
--- OpenXM_contrib2/asir2000/io/ws_fileio.c	2000/08/21 08:31:39	1.2
+++ OpenXM_contrib2/asir2000/io/ws_fileio.c	2009/02/13 11:25:48	1.9
@@ -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.
  * 
@@ -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.1.1.1 1999/12/03 07:39:11 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ws_fileio.c,v 1.8 2009/02/07 22:52:30 ohara Exp $ 
 */
-#if defined(VISUAL) || MPI
+#if defined(VISUAL) || defined(MPI)
 #include<stdio.h>
 #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;
-#elif MPI
-#if defined(sparc)
+#else
 		(&rst->fp)->_file = -1;
+#endif
+#elif defined(MPI)
+#if defined(sparc) || defined(__FreeBSD__)
+		(&rst->fp)->_file = -1;
+#elif defined(linux)
+		(&rst->fp)->_fileno = -1;
 #else
 		fileno(&rst->fp) = -1;
 #endif
@@ -200,7 +206,7 @@ STREAM* s;
 
 #if defined(VISUAL)
 	size = recv(s->fildes,data,count,0);
-#elif MPI
+#elif defined(MPI)
 	{
 		MPI_Status status;
 
@@ -226,14 +232,14 @@ STREAM* s;
 #if defined(VISUAL)
 	size = send(s->fildes,data,count,0);
 	return size;
-#elif MPI
+#elif defined(MPI)
 	MPI_Ssend(&count,1,MPI_INT,s->fildes,0,MPI_COMM_WORLD);
 	MPI_Ssend(data,count,MPI_CHAR,s->fildes,0,MPI_COMM_WORLD);
 	return count;
 #endif
 }
 
-#if MPI
+#if defined(MPI)
 int mpi_nprocs,mpi_myid;
  
 void mpi_init()