===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v
retrieving revision 1.33
retrieving revision 1.38
diff -u -p -r1.33 -r1.38
--- OpenXM/src/kxx/ox_texmacs.c	2006/03/06 08:55:31	1.33
+++ OpenXM/src/kxx/ox_texmacs.c	2015/10/10 11:29:46	1.38
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.32 2006/03/03 10:55:33 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.37 2015/10/08 11:49:38 takayama Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,14 +9,14 @@
 #include "serversm.h"
 #include "ox_pathfinder.h"
 
-#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
 
 /*
@@ -143,6 +143,9 @@ main(int argc,char *argv[]) {
   Dfp = fopen("/tmp/debug-texmacs.txt","w");
 #endif
   
+  /* Initialize kanlib (gc is also initialized) */
+  KSstart();
+
   /* Set consts */
   Quiet = 1;
   for (i=1; i<argc; i++) {
@@ -194,8 +197,6 @@ main(int argc,char *argv[]) {
     exit(10);
   }
 
-  /* Initialize kanlib (gc is also initialized) */
-  KSstart();
 
   /* Main loop */
   printf("%s",Data_begin_v[View]);
@@ -612,12 +613,12 @@ static int startEngine(int type,char *msg) {
     /* Initialize the setting of asir. */
     if (AsirInitFile) {  /* cf. asir-contrib/packages/src/cfep-init.rr */
 	  unsigned char *ss;
-	  ss = (unsigned char *)GC_malloc(strlen(AsirInitFile)+256);
+	  ss = (unsigned char *)sGC_malloc(strlen(AsirInitFile)+256);
 	  sprintf((char *)ss," oxasir.ccc (load(\"%s\");) oxsubmit oxasir.ccc oxgeterrors length 0 gt { (Error in loading asirInitFile) message} { } ifelse ",AsirInitFile);
 	  /* printf("Loading --asirInitFile %s\n",AsirInitFile); */
 	  KSexecuteString(ss);
     }
-    KSexecuteString(" oxasir.ccc (if(1) {  Xm_server_mode = 1; Xm_helpdir = \"help-eg\";  } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo ");
+    KSexecuteString(" oxasir.ccc (if(1) {  Xm_server_mode = 1; Xm_helpdir = \"help-en\";  } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo ");
     KSexecuteString(" oxasir.ccc (if(1) {  ctrl(\"message\",0);  } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo ");
     /* bug; if ctrl is written with Xm_helpdir = ... without oxpopcmo, then it does
        not work. */
@@ -698,8 +699,7 @@ static int pngCheck(void) {
   if (checked) return ans;
   checked = 1;
   if (!getCommandPath("latex")) return 0;
-  if (!getCommandPath("dvips")) return 0;
-  if (!getCommandPath("pstoimg")) return 0;
+  if (!getCommandPath("dvipng")) return 0;
   ans = 1;  return 1;
 }
 static void pngNotAvailable(void) {