=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ox.h,v retrieving revision 1.25 retrieving revision 1.30 diff -u -p -r1.25 -r1.30 --- OpenXM_contrib2/asir2000/include/ox.h 2015/08/04 06:20:45 1.25 +++ OpenXM_contrib2/asir2000/include/ox.h 2016/06/29 05:10:14 1.30 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.24 2010/12/12 07:38:00 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.29 2015/08/18 02:26:05 noro Exp $ */ #include "com.h" @@ -96,6 +96,7 @@ #define CMO_DISTRIBUTED_POLYNOMIAL 31 #define CMO_UNIVARIATE_POLYNOMIAL 33 #define CMO_RATIONAL 34 +#define CMO_COMPLEX 35 #define CMO_64BIT_MACHINE_DOUBLE 40 #define CMO_ARRAY_OF_64BIT_MACHINE_DOUBLE 41 @@ -104,6 +105,7 @@ #define CMO_BIGFLOAT 50 #define CMO_IEEE_DOUBLE_FLOAT 51 +#define CMO_BIGFLOAT32 52 #define CMO_INDETERMINATE 60 #define CMO_TREE 61 @@ -161,7 +163,7 @@ typedef FILE *ox_stream; #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_r) #elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(_IBMR2) #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_cnt) -#elif defined(VISUAL) +#elif defined(VISUAL) || defined(__MINGW32__) #define FP_DATA_IS_AVAILABLE(fp) ((fp)->p < (fp)->buf_size) #elif defined(hpux) #define FP_DATA_IS_AVAILABLE(fp) ((fp)->__cnt) @@ -202,6 +204,7 @@ void read_cmo_list(FILE *s,Obj *rp); void read_cmo_zz(FILE *s,int *sgn,N *rp); void read_cmo_uint(FILE *s,USINT *rp); void read_cmo_bf(FILE *s,BF *q); +void read_cmo_complex(FILE *s,C *q); void read_cmo(FILE *s,Obj *rp); void write_cmo_tree(FILE *s,LIST l); void write_cmo_error(FILE *s,ERR e); @@ -217,7 +220,9 @@ void write_cmo_zz(FILE *s,int sgn,N n); void write_cmo_real(FILE *s,Real real); void write_cmo_q(FILE *s,Q q); void write_cmo_bf(FILE *s,BF q); +void write_cmo_complex(FILE *s,C q); void write_cmo_uint(FILE *s,USINT ui); +void write_cmo_matrix_as_list(FILE *s,MAT m); void write_cmo_mathcap(FILE *s,MATHCAP mc); int cmo_tag(Obj obj,int *tag); void write_cmo(FILE *s,Obj obj);