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

Diff for /OpenXM_contrib2/asir2000/io/io.c between version 1.23 and 1.25

version 1.23, 2018/03/29 01:32:53 version 1.25, 2020/10/04 03:14:08
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/io.c,v 1.22 2017/08/31 09:11:04 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.24 2018/09/09 08:13:42 ohara Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
   #include "ox.h"
 #if defined(VISUAL) || defined(__MINGW32__) || defined(MPI)  #if defined(VISUAL) || defined(__MINGW32__) || defined(MPI)
 #include "wsio.h"  #include "wsio.h"
 #endif  #endif
Line 58  extern int ox_do_copy, ox_do_count, ox_count_length, o
Line 59  extern int ox_do_copy, ox_do_count, ox_count_length, o
 extern char *ox_copy_bptr;  extern char *ox_copy_bptr;
 extern int ox_get_pari_result;  extern int ox_get_pari_result;
   
 /* XXX */  void reset_ox_pari();
 void write_cmo(pointer,Obj);  
   
 void reset_io()  void reset_io()
 {  {
Line 140  int gen_fread (char *ptr,int size,int nitems,FILE *str
Line 140  int gen_fread (char *ptr,int size,int nitems,FILE *str
     return 0;      return 0;
   } else {    } else {
 #if defined(VISUAL) || defined(__MINGW32__)  #if defined(VISUAL) || defined(__MINGW32__)
     if ( _fileno(stream) < 0 )      if ( WSIO_fileno((STREAM *)stream) < 0 )
       n = cread(ptr,size,nitems,(STREAM *)stream);        n = cread(ptr,size,nitems,(STREAM *)stream);
     else      else
 #elif defined(MPI)  #elif defined(MPI)
Line 174  int gen_fwrite (char *ptr,int size,int nitems,FILE *st
Line 174  int gen_fwrite (char *ptr,int size,int nitems,FILE *st
     return 0;      return 0;
   } else    } else
 #if defined(VISUAL) || defined(__MINGW32__)  #if defined(VISUAL) || defined(__MINGW32__)
   if ( _fileno(stream) < 0 )    if ( WSIO_fileno((STREAM *)stream) < 0 )
     return cwrite(ptr,size,nitems,(STREAM *)stream);      return cwrite(ptr,size,nitems,(STREAM *)stream);
   else    else
 #elif defined(MPI)  #elif defined(MPI)

Legend:
Removed from v.1.23  
changed lines
  Added in v.1.25

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>