=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.41 retrieving revision 1.43 diff -u -p -r1.41 -r1.43 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2016/04/01 18:12:39 1.41 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2016/08/23 02:24:19 1.43 @@ -1,5 +1,5 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.40 2015/08/27 03:03:33 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.42 2016/07/14 08:16:19 ohara Exp $ */ #ifndef _OX_TOOLKIT_H_ #define _OX_TOOLKIT_H_ @@ -15,6 +15,8 @@ #if defined(_MSC_VER) #include +#else +#include #endif #define MALLOC(x) GC_MALLOC((x)) @@ -40,6 +42,7 @@ typedef struct { typedef struct mathcap { table *cmotbl; table *smtbl; + char **opts; } mathcap; /* OpenXM File Descripter */ @@ -59,6 +62,18 @@ typedef struct OXFILE{ double (*receive_double)(struct OXFILE *oxfp); } OXFILE; +#if 0 +#define OX_FD_SETSIZE FD_SETSIZE +#else +#define OX_FD_SETSIZE 32 +#endif + +typedef struct { + int count; + fd_set fdset; + OXFILE *p[OX_FD_SETSIZE]; +} OXFILE_set; + typedef struct cmo { int tag; } cmo; @@ -304,6 +319,7 @@ 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[]); +void mathcap_init2(int ver, char *vstr, char *sysname, int cmos[], int sms[], char *options[]); cmo_mathcap* mathcap_get(mathcap *); mathcap *mathcap_update(mathcap *, cmo_mathcap *mc); int mathcap_allowQ_cmo(mathcap *, cmo *ob);