=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.18 retrieving revision 1.23 diff -u -p -r1.18 -r1.23 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2003/05/28 08:43:59 1.18 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2003/06/05 21:12:07 1.23 @@ -1,5 +1,5 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.17 2003/05/25 16:35:41 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.22 2003/06/03 16:06:48 ohara Exp $ */ #ifndef _OX_TOOLKIT_H_ @@ -18,7 +18,14 @@ extern "C" { #include #include #include +#include +#define MALLOC(x) GC_MALLOC((x)) +#define MALLOC_ATOMIC(x) GC_MALLOC_ATOMIC((x)) +#define ALLOCA(x) alloca((x)) +/* #define FREE(x) free((x)) */ +#define FREE(x) + #if !defined(__GNUC__) && !defined(__inline__) #define __inline__ #endif @@ -44,6 +51,9 @@ 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 cmo { @@ -84,6 +94,7 @@ typedef struct cell { struct cmo *cmo; struct cell *next; struct cell *prev; + int exp; } cell; typedef struct { @@ -201,6 +212,7 @@ cell* list_first(cmo_list *); int list_endof(cmo_list *, cell *el); cell* list_next(cell *el); cmo_list* list_append(cmo_list*, cmo *ob); +cmo_list* list_append_monomial(cmo_list* , cmo* coef, int exp); cmo_list* list_appendl(cmo_list*, ...); int list_length(cmo_list* ); cmo* list_nth(cmo_list* , int n);