=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.38 retrieving revision 1.42 diff -u -p -r1.38 -r1.42 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2015/08/18 02:24:04 1.38 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2016/07/14 08:16:19 1.42 @@ -1,5 +1,5 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.37 2015/08/17 05:18:35 noro Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.41 2016/04/01 18:12:39 ohara Exp $ */ #ifndef _OX_TOOLKIT_H_ #define _OX_TOOLKIT_H_ @@ -13,6 +13,12 @@ #include #include +#if defined(_MSC_VER) +#include +#else +#include +#endif + #define MALLOC(x) GC_MALLOC((x)) #define MALLOC_ATOMIC(x) GC_MALLOC_ATOMIC((x)) #define ALLOCA(x) alloca((x)) @@ -55,6 +61,18 @@ typedef struct OXFILE{ double (*receive_double)(struct OXFILE *oxfp); } OXFILE; +#if 0 +#define OX_FD_SETSIZE FD_SETSIZE +#else +#define OX_FD_SETSIZE 32 +#endif + +typedef struct { + int count; + fd_set fdset; + OXFILE *p[OX_FD_SETSIZE]; +} OXFILE_set; + typedef struct cmo { int tag; } cmo; @@ -206,7 +224,7 @@ cmo_qq* new_cmo_qq_set_mpz(mpz_ptr num, mpz cmo_bf* new_cmo_bf(); cmo_bf* new_cmo_bf_set_mpfr(mpfr_ptr q); cmo_complex* new_cmo_complex(); -cmo_complex* new_cmo_bf_set_re_im(cmo *re,cmo *im); +cmo_complex* new_cmo_complex_set_re_im(cmo *re,cmo *im); cmo_zero* new_cmo_zero(); cmo_double* new_cmo_double(double d); cmo_distributed_polynomial* new_cmo_distributed_polynomial(); @@ -267,6 +285,7 @@ cmo_list* list_append_monomial(cmo_list* , cm cmo_list* list_appendl(cmo_list*, ...); int list_length(cmo_list* ); cmo* list_nth(cmo_list* , int n); +cmo* list_first_cmo(cmo_list *); int cmolen_cmo(cmo* m); void dump_buffer_init(char *s);