===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.35
retrieving revision 1.41
diff -u -p -r1.35 -r1.41
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2008/08/01 08:29:40	1.35
+++ 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.34 2007/03/14 10:30:54 ohara 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_
@@ -7,11 +7,16 @@
 
 #include <stdio.h>
 #include <gmp.h>
+#include <mpfr.h>
 #include <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
 #include <gc/gc.h>
 
+#if defined(_MSC_VER)
+#include <malloc.h>
+#endif
+
 #define MALLOC(x) GC_MALLOC((x))
 #define MALLOC_ATOMIC(x) GC_MALLOC_ATOMIC((x))
 #define ALLOCA(x) alloca((x))
@@ -120,6 +125,16 @@ typedef struct {
 
 typedef struct {
     int tag;
+    mpfr_t mpfr;
+} cmo_bf;
+
+typedef struct {
+    int tag;
+    cmo *re,*im;
+} cmo_complex;
+
+typedef struct {
+    int tag;
     double d; /* machine dependent */
 } cmo_double;
 
@@ -192,6 +207,10 @@ 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();
+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();
@@ -252,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);
@@ -261,6 +281,8 @@ void               dump_ox_data(ox_data* m);
 
 void               print_cmo(cmo* c);
 void               resize_mpz(mpz_ptr mpz, int size);
+
+int                cmo_to_int(cmo *n);
 
 typedef cmo *(*hook_t)(OXFILE *, cmo *);