=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/global.c,v retrieving revision 1.21 retrieving revision 1.35 diff -u -p -r1.21 -r1.35 --- OpenXM/src/kan96xx/Kan/global.c 2003/07/10 05:01:41 1.21 +++ OpenXM/src/kan96xx/Kan/global.c 2006/12/21 05:29:49 1.35 @@ -1,4 +1,4 @@ -/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.20 2002/11/07 23:35:23 takayama Exp $ */ +/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.34 2005/06/15 02:22:50 takayama Exp $ */ #include #include #include "datatype.h" @@ -103,7 +103,15 @@ int CmoDMSOutputOption = 0; /* Output with (1) RING_BY_NAME or (0) DMS_OF_N_VARIABLES. plugin/cmo.c */ int SecureMode = 0; -int TangentCone = 0; +int RestrictedMode = 0; +int RestrictedMode_saved = 0; +int Ecart = 0; +int EcartAutomaticHomogenization = 0; +int TraceLift = 0; +struct ring *TraceLift_ringmod = NULL; +int DoCancel = 0; +int QuoteMode = 0; +int UseDsmall = 0; /* global variables for stackmachine.c */ int VerboseStack = 1; /* 0 is quiet, 1 is standard, 2 ... */ @@ -124,10 +132,6 @@ jmp_buf EnvOfStackMachine; #endif #endif -#if defined(__CYGWIN__) -int errno; -#endif - struct object NullObject; struct object NoObject; @@ -136,7 +140,7 @@ int Lookup[TYPES][TYPES]; int Quiet = 0; int TimerOn = 0; -char *VersionString = "3.021108"; +char *VersionString = "3.050615"; char *LeftBracket = NULL; char *RightBracket = NULL; @@ -156,6 +160,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; @@ -164,9 +169,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