===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v
retrieving revision 1.36
retrieving revision 1.39
diff -u -p -r1.36 -r1.39
--- OpenXM/src/kxx/ox_texmacs.c	2015/09/28 07:01:27	1.36
+++ OpenXM/src/kxx/ox_texmacs.c	2016/03/31 05:27:34	1.39
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.35 2009/02/22 16:40:05 ohara Exp $ */
+/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.38 2015/10/10 11:29:46 takayama Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,15 +9,14 @@
 #include "serversm.h"
 #include "ox_pathfinder.h"
 
-void *sGC_malloc(size_t size);
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__MSYS__)
 #define JMP_BUF sigjmp_buf
-#define SETJMP(env)  sigsetjmp(env,1)
-#define LONGJMP(env,p)  siglongjmp(env,p)
+#define SETJMP(env)  MYSIGSETJMP(env,1)
+#define LONGJMP(env,p)  MYSIGLONGJMP(env,p)
 #else
 #define JMP_BUF jmp_buf
-#define SETJMP(env)  setjmp(env)
-#define LONGJMP(env,p)  longjmp(env,p)
+#define SETJMP(env)  MYSETJMP(env)
+#define LONGJMP(env,p)  MYLONGJMP(env,p)
 #endif
 
 /*
@@ -217,8 +216,8 @@ main(int argc,char *argv[]) {
   if (LanguageResource != NULL) KSexecuteString(LanguageResource);
   startEngine(TM_Engine," ");
 
-  if (signal(SIGINT,SIG_IGN) != SIG_IGN) {
-    signal(SIGINT,ctrlC);
+  if (mysignal(SIGINT,SIG_IGN) != SIG_IGN) {
+    mysignal(SIGINT,ctrlC);
   }
 
   irt = 0;
@@ -231,8 +230,8 @@ main(int argc,char *argv[]) {
         RestrictedMode = RestrictedMode_saved;
       }
       Calling_ctrlC_hook = 0; 
-      if (signal(SIGINT,SIG_IGN) != SIG_IGN) {
-        signal(SIGINT,ctrlC);
+      if (mysignal(SIGINT,SIG_IGN) != SIG_IGN) {
+        mysignal(SIGINT,ctrlC);
       }
       irt = 1;
       continue;