===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.8
retrieving revision 1.14
diff -u -p -r1.8 -r1.14
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2000/11/28 04:24:12	1.8
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/03/23 20:17:35	1.14
@@ -1,12 +1,14 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.7 2000/11/27 09:57:10 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.13 2003/02/03 23:13:23 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
 #define _OX_TOOLKIT_H_
 
 #include <stdio.h>
+#if defined(WITH_GMP)
 #include <gmp.h>
+#endif /* WITH_GMP */
 #include <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
@@ -32,6 +34,7 @@ typedef struct OXFILE{
     int (*send_int32)(struct OXFILE *oxfp, int int32);
     int (*receive_int32)(struct OXFILE *oxfp);
     int serial_number;
+    int received_serial_number;
     struct OXFILE *control;  /* pointer to his control server. */
     struct mathcap *mathcap;
     int error;
@@ -90,6 +93,7 @@ typedef struct {
     cmo *coef;
 } cmo_monomial32;
 
+#if defined(WITH_GMP)
 typedef struct {
     int tag;
     mpz_t mpz;
@@ -100,7 +104,13 @@ typedef struct {
     cmo *num;  /* Bunshi (cmo_zz) */
     cmo *den;  /* Bunbo (cmo_zz) */
 } cmo_qq;
+#endif /* WITH_GMP */
 
+typedef struct {
+    int tag;
+    double d; /* machine dependent */
+} cmo_double;
+
 /* The following is a derived class from cmo_list. 
    that is, list_append can be used. */
 typedef struct {
@@ -131,13 +141,16 @@ cmo_mathcap*       new_cmo_mathcap(cmo* ob);
 cmo_list*          new_cmo_list();
 cmo_monomial32*    new_cmo_monomial32();
 cmo_monomial32*    new_cmo_monomial32_size(int size);
+#if defined(WITH_GMP)
 cmo_zz*            new_cmo_zz();
 cmo_zz*            new_cmo_zz_size(int size);
 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);
+#endif /* WITH_GMP */
 cmo_zero*          new_cmo_zero();
+cmo_double*        new_cmo_double(double d);
 cmo_distributed_polynomial* new_cmo_distributed_polynomial();
 cmo_dms_generic*   new_cmo_dms_generic();
 cmo_ring_by_name*  new_cmo_ring_by_name(cmo* ob);
@@ -196,7 +209,9 @@ void               dump_ox_command(ox_command* m);
 void               dump_ox_data(ox_data* m);
 
 void               print_cmo(cmo* c);
+#if defined(WITH_GMP)
 void               resize_mpz(mpz_ptr mpz, int size);
+#endif /* WITH_GMP */
 
 typedef cmo *(*hook_t)(OXFILE *, cmo *);
 
@@ -217,7 +232,7 @@ symbol_t lookup_by_symbol(char *key);
 symbol_t lookup_by_token(int tok);
 symbol_t lookup_by_tag(int tag);
 symbol_t lookup(int i);
-char *symbol_get_key(symbol_t sp);
+char*    get_symbol_by_tag(int tag);
 
 /* for mathcap database */
 mathcap *new_mathcap();
@@ -251,4 +266,6 @@ void oxf_mathcap_update(OXFILE *oxfp, cmo_mathcap *ob)
 char *which(char *exe, const char *env);
 char *generate_otp();
 
+int ox_stderr_init(FILE *fp);
+int ox_printf(char *format, ...);
 #endif /* _OX_TOOLKIT_H_ */