===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.72
retrieving revision 1.76
diff -u -p -r1.72 -r1.76
--- OpenXM_contrib2/asir2000/parse/eval.c	2015/08/06 10:01:53	1.72
+++ OpenXM_contrib2/asir2000/parse/eval.c	2017/02/07 08:30:31	1.76
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.71 2015/08/04 06:20:45 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.75 2016/08/24 08:21:03 ohara Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -64,7 +64,6 @@ extern NODE PVSS;
 
 int f_break,f_return,f_continue;
 int evalstatline;
-int recv_intr;
 int show_crossref;
 int at_root;
 void gen_searchf_searchonly(char *name,FUNC *r,int global);
@@ -92,17 +91,8 @@ pointer eval(FNODE f)
 	RANGE range;
 	QUOTE expr,pattern;
 
-#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
-	if ( recv_intr ) {
-#include <signal.h>
-		if ( recv_intr == 1 ) {
-			recv_intr = 0;
-			int_handler(SIGINT);
-		} else {
-			recv_intr = 0;
-			ox_usr1_handler(0);
-		}
-	}
+#if defined(VISUAL) || defined(__MINGW32__)
+	check_intr();
 #endif
 	if ( !f )
 		return ( 0 );
@@ -193,7 +183,7 @@ pointer eval(FNODE f)
 			val = eval_rec_mapf((FUNC)FA0(f),(FNODE)FA1(f)); break;
 		case I_IFUNC:
 			val = evalif((FNODE)FA0(f),(FNODE)FA1(f),(FNODE)FA2(f)); break;
-#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 		case I_TIMER:
 			{
 				int interval;
@@ -927,7 +917,7 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 			break;
 		case A_USR:
 			/* stack check */
-#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(__CYGWIN__)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 			if ( !stack_size ) {
 				struct rlimit rl;
 				getrlimit(RLIMIT_STACK,&rl);
@@ -1642,7 +1632,7 @@ MODULE mkmodule(char *name)
 		mod->name = (char *)MALLOC_ATOMIC(len+1);
 		strcpy(mod->name,name);
 		mod->pvs = mpvs = (VS)MALLOC(sizeof(struct oVS));
-		reallocarray((char **)&mpvs->va,(int *)&mpvs->asize,
+		asir_reallocarray((char **)&mpvs->va,(int *)&mpvs->asize,
 			(int *)&mpvs->n,(int)sizeof(struct oPV));
 		mod->usrf_list = 0;
 		MKNODE(m,mod,MODULE_LIST);