=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/cpp.h,v retrieving revision 1.2 retrieving revision 1.5 diff -u -p -r1.2 -r1.5 --- OpenXM_contrib2/asir2000/parse/cpp.h 2000/08/21 08:31:46 1.2 +++ OpenXM_contrib2/asir2000/parse/cpp.h 2018/03/29 01:32:54 1.5 @@ -23,7 +23,7 @@ * shall be made on your publication or presentation in any form of the * results obtained by use of the SOFTWARE. * (4) In the event that you modify the SOFTWARE, you shall notify FLL by - * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification * for such modification or the source code of the modified part of the * SOFTWARE. * @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/cpp.h,v 1.1.1.1 1999/12/03 07:39:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/cpp.h,v 1.4 2000/12/05 01:24:56 noro Exp $ */ #ifndef _ACCUM_ #define _ACCUM_ @@ -53,9 +53,9 @@ #include typedef struct { - int have; - int used; - char *buf; } ACCUM; + int have; + int used; + char *buf; } ACCUM; char *init_accum(void); char *accum_result(char *A); @@ -67,11 +67,11 @@ char *accum_buf(char *A); #define _EXPR_ typedef struct _node { - int leaf; - char *name; - struct _node *left; - struct _node *right; - int op; } NODE; + int leaf; + char *name; + struct _node *left; + struct _node *right; + int op; } NODE; NODE *read_expr(); NODE *read_expr_p(void); @@ -83,8 +83,8 @@ extern int expr_sharp; #define _IF_ typedef struct _if { - struct _if *next; - int condstate; } IF; + struct _if *next; + int condstate; } IF; #define IFSTATE_TRUE 0 #define IFSTATE_FALSE 1 #define IFSTATE_STAYFALSE 2 @@ -149,18 +149,8 @@ int issymchar(char c); #ifndef _MALLOC_ #define _MALLOC_ -#if 0 -#define malloc check0_malloc -#define realloc check0_realloc -#endif - -#if defined(THINK_C) -char *malloc(int); -char *realloc(void *,int); -#else char *malloc(size_t); char *realloc(void *, size_t); -#endif char *copyofstr(char *str); char *copyofblk(char *blk, int len); #define NEW(type) ((type *) malloc((int)sizeof(type))) @@ -181,15 +171,15 @@ extern int n_misses; #define _SYMTBL_ typedef struct _def { - struct _def *link; - char *name; - int nargs; - unsigned char *repl; - int how; + struct _def *link; + char *name; + int nargs; + unsigned char *repl; + int how; #define DEF_PREDEF 0 #define DEF_CMDLINE 1 #define DEF_DEFINE 2 - } DEF; + } DEF; extern DEF **symtbl; extern int symtbl_size;