===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.31
retrieving revision 1.40
diff -u -p -r1.31 -r1.40
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2005/07/20 17:48:03	1.31
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2015/08/27 03:03:33	1.40
@@ -1,27 +1,32 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.30 2005/03/03 07:25:17 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.39 2015/08/26 20:17:28 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
-
 #define _OX_TOOLKIT_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #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))
 /* #define FREE(x)   free((x)) */
 #define FREE(x)   
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if !defined(__GNUC__) && !defined(__inline__)
 #define __inline__
 #endif
@@ -115,12 +120,21 @@ typedef struct {
 
 typedef struct {
     int tag;
-    cmo *num;  /* Bunshi (cmo_zz) */
-    cmo *den;  /* Bunbo (cmo_zz) */
+    mpq_t mpq;
 } cmo_qq;
 
 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;
 
@@ -190,9 +204,13 @@ 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();
 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();
@@ -262,6 +280,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 *);