===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.15
retrieving revision 1.20
diff -u -p -r1.15 -r1.20
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2003/03/30 08:05:22	1.15
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/06/02 10:25:57	1.20
@@ -1,10 +1,14 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.14 2003/03/23 20:17:35 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.19 2003/05/29 15:50:49 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>
@@ -15,6 +19,10 @@
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
 
+#define MALLOC(x) malloc((x))
+#define ALLOCA(x) alloca((x))
+#define FREE(x)   free((x))
+
 #if !defined(__GNUC__) && !defined(__inline__)
 #define __inline__
 #endif
@@ -40,9 +48,12 @@ typedef struct OXFILE{
     struct OXFILE *control;  /* pointer to his control server. */
     struct mathcap *mathcap;
     int error;
+    char *wbuf;
+    int wbuf_size;
+    int wbuf_count;
 } OXFILE;
 
-typedef struct {
+typedef struct cmo {
     int tag;
 } cmo;
 
@@ -77,7 +88,7 @@ typedef cmo_mathcap cmo_indeterminate;
 
 /* a double linked list */
 typedef struct cell {
-    cmo *cmo;
+    struct cmo *cmo;
     struct cell *next;
     struct cell *prev;
 } cell;
@@ -131,7 +142,7 @@ typedef struct {
 
 typedef struct {
     int tag;
-    cmo *cmo;
+    struct cmo *cmo;
 } ox_data;
 
 cmo_null*          new_cmo_null();
@@ -165,6 +176,7 @@ cmo_error2*        make_error_object(int err_code, cmo
 
 /* Low level API */
 cmo*               receive_cmo(OXFILE *fp);
+cmo*               receive_cmo_tag(OXFILE *fp, int tag);
 int                receive_int32(OXFILE *fp);
 int                receive_ox_tag(OXFILE *fp);
 
@@ -192,13 +204,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);
@@ -233,9 +245,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);
@@ -264,4 +276,9 @@ char *generate_otp();
 
 int ox_stderr_init(FILE *fp);
 int ox_printf(char *format, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _OX_TOOLKIT_H_ */