=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.37 retrieving revision 1.41 diff -u -p -r1.37 -r1.41 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2015/08/17 05:18:35 1.37 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2016/04/01 18:12:39 1.41 @@ -1,5 +1,5 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.36 2015/08/04 05:24:44 noro Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.40 2015/08/27 03:03:33 ohara Exp $ */ #ifndef _OX_TOOLKIT_H_ #define _OX_TOOLKIT_H_ @@ -13,6 +13,10 @@ #include #include +#if defined(_MSC_VER) +#include +#endif + #define MALLOC(x) GC_MALLOC((x)) #define MALLOC_ATOMIC(x) GC_MALLOC_ATOMIC((x)) #define ALLOCA(x) alloca((x)) @@ -126,6 +130,11 @@ typedef struct { typedef struct { int tag; + cmo *re,*im; +} cmo_complex; + +typedef struct { + int tag; double d; /* machine dependent */ } cmo_double; @@ -200,6 +209,8 @@ cmo_qq* new_cmo_qq_set_mpq(mpq_ptr q); cmo_qq* new_cmo_qq_set_mpz(mpz_ptr num, mpz_ptr den); cmo_bf* new_cmo_bf(); cmo_bf* new_cmo_bf_set_mpfr(mpfr_ptr q); +cmo_complex* new_cmo_complex(); +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(); @@ -260,6 +271,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);