===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/global.c,v
retrieving revision 1.13
retrieving revision 1.32
diff -u -p -r1.13 -r1.32
--- OpenXM/src/kan96xx/Kan/global.c	2000/07/26 02:21:30	1.13
+++ OpenXM/src/kan96xx/Kan/global.c	2004/09/21 05:46:15	1.32
@@ -1,4 +1,4 @@
-/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.12 2000/06/08 08:35:02 takayama Exp $ */
+/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.31 2004/09/17 02:42:57 takayama Exp $ */
 #include <stdio.h>
 #include <setjmp.h>
 #include "datatype.h"
@@ -13,22 +13,22 @@
   Any setting must keep the relation: L<=M<=N.
   You must see mmwMult() in poly.c in the above case.
   Example. L=M=0 means there is no q-variables and difference variables.
-           L=5, M=N=5 means all variables are q-variables (x0=q).
-	   L=2, M=2, N=5 means x0=q, x1 is q-variable and x2,,,,x4 are
-	   differential variables.
-	   L=0, M=2, N=5 means x0,x1 are difference variables and x2,,,x4
-	   are differential variables. */
+  L=5, M=N=5 means all variables are q-variables (x0=q).
+  L=2, M=2, N=5 means x0=q, x1 is q-variable and x2,,,,x4 are
+  differential variables.
+  L=0, M=2, N=5 means x0,x1 are difference variables and x2,,,x4
+  are differential variables. */
 /*#define   L     0     number of q-variables */
 /*#define   M     0     number of difference variables */
 /*Number of elimination variables  */
 /*#define  LL     0     */
 /*#define  MM     0    */
-              /* x_MM,...,x_{M-1} are eliminated difference variables */
-              /* MM < M if you want to use it. MM>=M if you do not use it */
+/* x_MM,...,x_{M-1} are eliminated difference variables */
+/* MM < M if you want to use it. MM>=M if you do not use it */
 /*#define  NN     9  */
-              /*x_NN,...,x_{N-1} are eliminated differential variables */
-              /* NN < N if you want to use it. NN>=N if you do not use it.
-		       See the eliminated_standard() in dbm3.c */
+/*x_NN,...,x_{N-1} are eliminated differential variables */
+/* NN < N if you want to use it. NN>=N if you do not use it.
+               See the eliminated_standard() in dbm3.c */
 
 
 /* They are not used.
@@ -100,9 +100,17 @@ int KSPushEnvMode = 0;
 int Sugar = 0;
 int Homogenize_vec = 1; /*x + e (x+1)===>(1) x h + e (x+h) or (0)x + e(x+h) */
 int CmoDMSOutputOption = 0;  /* Output with
-			     (1) RING_BY_NAME or (0) DMS_OF_N_VARIABLES.
-			     plugin/cmo.c */
+                 (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 ... */
@@ -116,8 +124,12 @@ FILE *Fstack = NULL; /* Initialized to standard output
 /* in case of Solaris, use the following: */
 int EnvOfStackMachine[2000];
 #else
+#if defined(__CYGIWN__)
+sigjmp_buf EnvOfStackMachine;
+#else
 jmp_buf EnvOfStackMachine;
 #endif
+#endif
 
 struct object NullObject;
 struct object NoObject;
@@ -127,7 +139,7 @@ int Lookup[TYPES][TYPES];
 int Quiet = 0;
 int TimerOn = 0;
 
-char *VersionString = "3.000726";
+char *VersionString = "3.040921";
 
 char *LeftBracket = NULL;
 char *RightBracket = NULL;
@@ -147,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;