===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/global.c,v
retrieving revision 1.20
retrieving revision 1.33
diff -u -p -r1.20 -r1.33
--- OpenXM/src/kan96xx/Kan/global.c	2002/11/07 23:35:23	1.20
+++ OpenXM/src/kan96xx/Kan/global.c	2005/06/09 04:47:16	1.33
@@ -1,4 +1,4 @@
-/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.19 2002/09/08 10:49:49 takayama Exp $ */
+/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.32 2004/09/21 05:46:15 takayama Exp $ */
 #include <stdio.h>
 #include <setjmp.h>
 #include "datatype.h"
@@ -103,6 +103,14 @@ 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;
+struct ring *TraceLift_ringmod = NULL;
+int DoCancel = 0;
+int QuoteMode = 0;
 
 /* global variables for stackmachine.c  */
 int VerboseStack = 1;     /* 0 is quiet, 1 is standard, 2 ... */
@@ -123,10 +131,6 @@ jmp_buf EnvOfStackMachine;
 #endif
 #endif
 
-#if defined(__CYGWIN__)
-int errno;
-#endif
-
 struct object NullObject;
 struct object NoObject;
 
@@ -135,7 +139,7 @@ int Lookup[TYPES][TYPES];
 int Quiet = 0;
 int TimerOn = 0;
 
-char *VersionString = "3.021108";
+char *VersionString = "3.040921";
 
 char *LeftBracket = NULL;
 char *RightBracket = NULL;
@@ -155,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;
@@ -163,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<TYPES; i++) {
     for (j=0; j<TYPES; j++)