=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.27 retrieving revision 1.30 diff -u -p -r1.27 -r1.30 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2003/11/12 15:20:18 1.27 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2005/03/03 07:25:17 1.30 @@ -1,21 +1,16 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.26 2003/09/18 12:46:08 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.29 2005/03/03 06:21:23 ohara Exp $ */ #ifndef _OX_TOOLKIT_H_ #define _OX_TOOLKIT_H_ -#include -#if defined(WITH_GMP) -#include -#else -#include "gmp_fake.h" -#endif /* WITH_GMP */ - #ifdef __cplusplus extern "C" { #endif +#include +#include #include #include #include @@ -55,6 +50,8 @@ typedef struct OXFILE{ char *wbuf; int wbuf_size; int wbuf_count; + int (*send_double)(struct OXFILE *oxfp, double int64); + double (*receive_double)(struct OXFILE *oxfp); } OXFILE; typedef struct cmo { @@ -191,6 +188,9 @@ cmo_zz* new_cmo_zz_set_si(int integer); cmo_zz* new_cmo_zz_set_mpz(mpz_ptr z); cmo_zz* new_cmo_zz_noinit(); cmo_zz* new_cmo_zz_set_string(char* s); +cmo_qq* new_cmo_qq_noinit(); +cmo_qq* new_cmo_qq_set_mpq(mpq_ptr q); +cmo_qq* new_cmo_qq_set_mpz(mpz_ptr num, mpz_ptr den); cmo_zero* new_cmo_zero(); cmo_double* new_cmo_double(double d); cmo_distributed_polynomial* new_cmo_distributed_polynomial();