===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.16
retrieving revision 1.20
diff -u -p -r1.16 -r1.20
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2003/05/24 23:10:40	1.16
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/06/02 10:25:57	1.20
@@ -1,5 +1,5 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.15 2003/03/30 08:05:22 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_
 
@@ -19,6 +19,10 @@ extern "C" {
 #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
@@ -44,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;
 
@@ -81,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;
@@ -135,7 +142,7 @@ typedef struct {
 
 typedef struct {
     int tag;
-    cmo *cmo;
+    struct cmo *cmo;
 } ox_data;
 
 cmo_null*          new_cmo_null();
@@ -169,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);