[BACK]Return to ws_fileio.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/ws_fileio.c between version 1.2 and 1.11

version 1.2, 2000/08/21 08:31:39 version 1.11, 2015/08/14 13:51:55
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (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   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * 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.10 2015/08/06 10:01:52 fujimoto Exp $
 */  */
 #if defined(VISUAL) || MPI  #if defined(VISUAL) || defined(__MINGW32__) || defined(MPI)
 #include<stdio.h>  #include<stdio.h>
 #include"wsio.h"  #include"wsio.h"
   
Line 159  char* mode;
Line 159  char* mode;
         rst = (STREAM*)malloc(sizeof(STREAM));          rst = (STREAM*)malloc(sizeof(STREAM));
         if (rst) {          if (rst) {
 #if defined(VISUAL)  #if defined(VISUAL)
   #if _MSC_VER < 1500
                 _fileno(&rst->fp) = -1;                  _fileno(&rst->fp) = -1;
 #elif MPI  #else
 #if defined(sparc)  
                 (&rst->fp)->_file = -1;                  (&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  #else
                 fileno(&rst->fp) = -1;                  fileno(&rst->fp) = -1;
 #endif  #endif
Line 198  STREAM* s;
Line 204  STREAM* s;
         if (!s)          if (!s)
                 return 0;                  return 0;
   
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
         size = recv(s->fildes,data,count,0);          size = recv(s->fildes,data,count,0);
 #elif MPI  #elif defined(MPI)
         {          {
                 MPI_Status status;                  MPI_Status status;
   
Line 223  STREAM* s;
Line 229  STREAM* s;
         if (!s || !count)          if (!s || !count)
                 return 0;                  return 0;
   
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
         size = send(s->fildes,data,count,0);          size = send(s->fildes,data,count,0);
         return size;          return size;
 #elif MPI  #elif defined(MPI)
         MPI_Ssend(&count,1,MPI_INT,s->fildes,0,MPI_COMM_WORLD);          MPI_Ssend(&count,1,MPI_INT,s->fildes,0,MPI_COMM_WORLD);
         MPI_Ssend(data,count,MPI_CHAR,s->fildes,0,MPI_COMM_WORLD);          MPI_Ssend(data,count,MPI_CHAR,s->fildes,0,MPI_COMM_WORLD);
         return count;          return count;
 #endif  #endif
 }  }
   
 #if MPI  #if defined(MPI)
 int mpi_nprocs,mpi_myid;  int mpi_nprocs,mpi_myid;
   
 void mpi_init()  void mpi_init()
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.11
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>