=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/global.c,v retrieving revision 1.27 retrieving revision 1.34 diff -u -p -r1.27 -r1.34 --- OpenXM/src/kan96xx/Kan/global.c 2003/11/20 09:20:36 1.27 +++ OpenXM/src/kan96xx/Kan/global.c 2005/06/15 02:22:50 1.34 @@ -1,4 +1,4 @@ -/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.26 2003/08/21 12:30:15 takayama Exp $ */ +/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.33 2005/06/09 04:47:16 takayama Exp $ */ #include #include #include "datatype.h" @@ -103,6 +103,8 @@ int CmoDMSOutputOption = 0; /* Output with (1) RING_BY_NAME or (0) DMS_OF_N_VARIABLES. plugin/cmo.c */ int SecureMode = 0; +int RestrictedMode = 0; +int RestrictedMode_saved = 0; int Ecart = 0; int EcartAutomaticHomogenization = 0; int TraceLift = 0; @@ -129,10 +131,6 @@ jmp_buf EnvOfStackMachine; #endif #endif -#if defined(__CYGWIN__) -int errno; -#endif - struct object NullObject; struct object NoObject; @@ -141,7 +139,7 @@ int Lookup[TYPES][TYPES]; int Quiet = 0; int TimerOn = 0; -char *VersionString = "3.030821"; +char *VersionString = "3.050615"; char *LeftBracket = NULL; char *RightBracket = NULL; @@ -161,6 +159,7 @@ FILE *Fk = NULL; /* Initialized to stdout in stackmac stackmachine_init() { int i,j; extern FILE *BaseFp; + GC_init(); OxSystemVersion = VersionString; Fstack = stdout; /* initialize output stream */ Fk = stdout; @@ -169,9 +168,11 @@ stackmachine_init() { /* initialize null object */ NullObject.tag = 0; NullObject.lc.op = NullObject.rc.op = (struct object *)NULL; + NullObject.attr = (struct object *)NULL; /* findUserdictionary returns NoObject if it cannot find the key.*/ NoObject.tag = -1; NoObject.lc.op = NoObject.rc.op = (struct object *)NULL; + NoObject.attr = (struct object *)NULL; /* Initalize lookup table */ for (i=0; i