===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/parser.c,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- OpenXM/src/kan96xx/Kan/parser.c	2015/09/27 08:12:42	1.10
+++ OpenXM/src/kan96xx/Kan/parser.c	2020/10/06 11:33:46	1.13
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/parser.c,v 1.9 2005/07/03 11:08:54 ohara Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/parser.c,v 1.12 2015/10/08 11:49:37 takayama Exp $ */
 /*
   parser.c   parser for poly.c
 */
@@ -11,10 +11,6 @@
 #include "extern.h"
 #include "extern2.h"
 
-#if defined(__MSYS__)
-#define setjmp(e) _setjmp(e)
-#define sigsetjmp(e,n) _setjmp(e)
-#endif
 
 #define NUM  1       /* NUM means struct Bignum */
 #define POL  0
@@ -44,8 +40,8 @@ static int Spv = 0;   /* stack pointer */
 #define SSIZE 20000
 static int TagStack[SSIZE];
 static union valObject ValStack[SSIZE];
-#define NAME_MAX 2000
-static char Name[NAME_MAX];
+#define MY_NAME_MAX 2000
+static char Name[MY_NAME_MAX];
 
 static union valObject ValTmp;
 
@@ -129,9 +125,9 @@ POLY stringToPOLY(s,ringp) 
   Ring0.p = 0;
   Ring0.next = (struct ring *)NULL; 
 #if defined(__CYGWIN__)
-  if (sigsetjmp(EnvOfParser,1)) {
+  if (MYSIGSETJMP(EnvOfParser,1)) {
 #else  
-  if (setjmp(EnvOfParser)) {
+  if (MYSETJMP(EnvOfParser)) {
 #endif
     fprintf(stderr,"\nERROR: You have syntax errors in the expression: %s\n",s);
     errorKan1("%s\n"," parser.c : Syntax error in the input polynomial.");
@@ -226,7 +222,7 @@ static int getoken() {
     i = 0;
     do {
       Name[i] = Ch; Name[i+1] = '\0'; i++;
-      if (i+2 >= NAME_MAX) {
+      if (i+2 >= MY_NAME_MAX) {
         errorParser("Too long name begining with @.");
       }
       Ch = getcharFromStr();
@@ -606,9 +602,9 @@ static void errorParser(s) char s[]; {
     GotoP = 0;
   }
 #if defined(__CYGWIN__)
-  siglongjmp(EnvOfParser,1);
+  MYSIGLONGJMP(EnvOfParser,1);
 #else
-  longjmp(EnvOfParser,1);
+  MYLONGJMP(EnvOfParser,1);
 #endif
 }