===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -p -r1.14 -r1.16
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2003/03/23 20:17:35	1.14
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/05/24 23:10:40	1.16
@@ -1,13 +1,19 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.13 2003/02/03 23:13:23 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.15 2003/03/30 08:05:22 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
 #define _OX_TOOLKIT_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 #if defined(WITH_GMP)
 #include <gmp.h>
+#else
+#include "gmp_fake.h"
 #endif /* WITH_GMP */
 #include <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
@@ -93,7 +99,6 @@ typedef struct {
     cmo *coef;
 } cmo_monomial32;
 
-#if defined(WITH_GMP)
 typedef struct {
     int tag;
     mpz_t mpz;
@@ -104,7 +109,6 @@ typedef struct {
     cmo *num;  /* Bunshi (cmo_zz) */
     cmo *den;  /* Bunbo (cmo_zz) */
 } cmo_qq;
-#endif /* WITH_GMP */
 
 typedef struct {
     int tag;
@@ -141,14 +145,12 @@ 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();
@@ -194,13 +196,13 @@ void               ox_push_cmd(OXFILE *sv, int sm_code
 void               ox_cmo_rpc(OXFILE *sv, char *function, int argc, cmo *argv[]);
 int                ox_flush(OXFILE *sv);
 
-cell*              list_first(cmo_list *this);
-int                list_endof(cmo_list *this, cell *el);
+cell*              list_first(cmo_list *);
+int                list_endof(cmo_list *, cell *el);
 cell*              list_next(cell *el);
-cmo_list*          list_append(cmo_list* this, cmo *ob);
-cmo_list*          list_appendl(cmo_list* this, ...);
-int                list_length(cmo_list* this);
-cmo*               list_nth(cmo_list* this, int n);
+cmo_list*          list_append(cmo_list*, cmo *ob);
+cmo_list*          list_appendl(cmo_list*, ...);
+int                list_length(cmo_list* );
+cmo*               list_nth(cmo_list* , int n);
 
 int                cmolen_cmo(cmo* m);
 void               dump_buffer_init(char *s);
@@ -209,9 +211,7 @@ 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 *);
 
@@ -237,9 +237,9 @@ char*    get_symbol_by_tag(int tag);
 /* for mathcap database */
 mathcap *new_mathcap();
 void mathcap_init(int ver, char *vstr, char *sysname, int cmos[], int sms[]);
-cmo_mathcap* mathcap_get(mathcap *this);
-mathcap *mathcap_update(mathcap *this, cmo_mathcap *mc);
-int mathcap_allowQ_cmo(mathcap *this, cmo *ob);
+cmo_mathcap* mathcap_get(mathcap *);
+mathcap *mathcap_update(mathcap *, cmo_mathcap *mc);
+int mathcap_allowQ_cmo(mathcap *, cmo *ob);
 
 int oxf_read(void *buffer, size_t size, size_t num, OXFILE *oxfp);
 int oxf_write(void *buffer, size_t size, size_t num, OXFILE *oxfp);
@@ -268,4 +268,9 @@ char *generate_otp();
 
 int ox_stderr_init(FILE *fp);
 int ox_printf(char *format, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _OX_TOOLKIT_H_ */