===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.17
retrieving revision 1.21
diff -u -p -r1.17 -r1.21
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2003/05/25 16:35:41	1.17
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/06/02 20:38:41	1.21
@@ -1,5 +1,5 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.16 2003/05/24 23:10:40 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.20 2003/06/02 10:25:57 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
@@ -18,7 +18,13 @@ extern "C" {
 #include <ox/cmotag.h>
 #include <ox/oxMessageTag.h>
 #include <ox/smCommand.h>
+#include <gc/gc.h>
 
+#define MALLOC(x) GC_MALLOC((x))
+#define ALLOCA(x) alloca((x))
+/* #define FREE(x)   free((x)) */
+#define FREE(x)   
+
 #if !defined(__GNUC__) && !defined(__inline__)
 #define __inline__
 #endif
@@ -44,9 +50,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 +90,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 +144,7 @@ typedef struct {
 
 typedef struct {
     int tag;
-    cmo *cmo;
+    struct cmo *cmo;
 } ox_data;
 
 cmo_null*          new_cmo_null();