=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.34 retrieving revision 1.36 diff -u -p -r1.34 -r1.36 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2007/03/14 10:30:54 1.34 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2015/08/04 05:24:44 1.36 @@ -1,16 +1,13 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.33 2005/10/12 04:03:37 takayama Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.35 2008/08/01 08:29:40 iwane Exp $ */ #ifndef _OX_TOOLKIT_H_ - #define _OX_TOOLKIT_H_ -#ifdef __cplusplus -extern "C" { -#endif #include #include +#include #include #include #include @@ -22,6 +19,10 @@ extern "C" { /* #define FREE(x) free((x)) */ #define FREE(x) +#ifdef __cplusplus +extern "C" { +#endif + #if !defined(__GNUC__) && !defined(__inline__) #define __inline__ #endif @@ -120,6 +121,11 @@ typedef struct { typedef struct { int tag; + mpfr_t mpfr; +} cmo_bf; + +typedef struct { + int tag; double d; /* machine dependent */ } cmo_double; @@ -192,6 +198,7 @@ cmo_zz* new_cmo_zz_set_string(char* s); cmo_qq* new_cmo_qq(); 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_set_mpfr(mpfr_ptr q); cmo_zero* new_cmo_zero(); cmo_double* new_cmo_double(double d); cmo_distributed_polynomial* new_cmo_distributed_polynomial();