===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ws_fileio.c,v
retrieving revision 1.1
retrieving revision 1.9
diff -u -p -r1.1 -r1.9
--- OpenXM_contrib2/asir2000/io/ws_fileio.c	1999/12/03 07:39:11	1.1
+++ OpenXM_contrib2/asir2000/io/ws_fileio.c	2009/02/13 11:25:48	1.9
@@ -1,5 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/io/ws_fileio.c,v 1.2 1999/11/19 10:41:08 noro Exp $ */
-#if defined(VISUAL) || MPI
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * 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@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * 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.8 2009/02/07 22:52:30 ohara Exp $ 
+*/
+#if defined(VISUAL) || defined(MPI)
 #include<stdio.h>
 #include"wsio.h"
 
@@ -112,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
@@ -153,7 +206,7 @@ STREAM* s;
 
 #if defined(VISUAL)
 	size = recv(s->fildes,data,count,0);
-#elif MPI
+#elif defined(MPI)
 	{
 		MPI_Status status;
 
@@ -179,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()