=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v retrieving revision 1.70 retrieving revision 1.72 diff -u -p -r1.70 -r1.72 --- OpenXM_contrib2/asir2000/parse/eval.c 2014/08/09 06:08:11 1.70 +++ OpenXM_contrib2/asir2000/parse/eval.c 2015/08/06 10:01:53 1.72 @@ -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.69 2013/11/21 06:48:04 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.71 2015/08/04 06:20:45 noro Exp $ */ #include #include "ca.h" @@ -57,9 +57,6 @@ #endif #include #include -#if defined(PARI) -#include "genpari.h" -#endif extern JMP_BUF timer_env; extern FUNC cur_binf; @@ -95,7 +92,7 @@ pointer eval(FNODE f) RANGE range; QUOTE expr,pattern; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( recv_intr ) { #include if ( recv_intr == 1 ) { @@ -196,7 +193,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) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) case I_TIMER: { int interval; @@ -733,15 +730,9 @@ pointer evalstat(SNODE f) case S_BP: if ( !nextbp && (!FA1(f) || eval((FNODE)FA1(f))) ) { if ( (FNODE)FA2(f) ) { -#if defined(PARI) - pari_outfile = stderr; -#endif asir_out = stderr; printexpr(CO,eval((FNODE)FA2(f))); putc('\n',asir_out); fflush(asir_out); -#if defined(PARI) - pari_outfile = stdout; -#endif asir_out = stdout; } else { nextbp = 1; nextbplevel = 0; @@ -936,7 +927,7 @@ pointer evalf(FUNC f,FNODE a,FNODE opt) break; case A_USR: /* stack check */ -#if !defined(VISUAL) && !defined(__CYGWIN__) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(__CYGWIN__) if ( !stack_size ) { struct rlimit rl; getrlimit(RLIMIT_STACK,&rl);