=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/debug.c,v retrieving revision 1.20 retrieving revision 1.22 diff -u -p -r1.20 -r1.22 --- OpenXM_contrib2/asir2000/parse/debug.c 2011/06/16 08:17:15 1.20 +++ OpenXM_contrib2/asir2000/parse/debug.c 2015/08/06 10:01:53 1.22 @@ -45,14 +45,11 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/debug.c,v 1.19 2006/12/05 01:47:08 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/debug.c,v 1.21 2015/08/04 06:20:45 noro Exp $ */ #include "ca.h" #include "parse.h" #include -#if defined(PARI) -#include "genpari.h" -#endif extern do_server_in_X11,do_file; @@ -150,7 +147,7 @@ void debug_init() { fclose(fp); } #if 0 -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 ) init_cmdwin(); #endif @@ -209,25 +206,25 @@ void debug(SNODE f) char buf[BUFSIZ]; char prompt[BUFSIZ]; char *p,*pe; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) char *line; #endif NODE tn; extern int do_fep; NODE pvss; -#if !defined(MPI) && !defined(VISUAL) +#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( !isatty(fileno(stdin)) && !do_server_in_X11 ) if ( do_file ) ExitAsir(); else return; #endif -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) suspend_timer(); #endif pvss = PVSS; debug_mode = 1; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 ) #endif show_debug_window(1); @@ -250,7 +247,7 @@ void debug(SNODE f) { int len; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 ) get_line(buf); else @@ -343,7 +340,7 @@ void debug(SNODE f) } LAST: debug_mode = 0; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 ) #endif show_debug_window(0); @@ -695,7 +692,7 @@ void bp(SNODE f) default: ln = f->ln; break; } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 ) #endif show_debug_window(1); @@ -703,7 +700,7 @@ void bp(SNODE f) CPVS->usrf->name,ln,CPVS->usrf->f.usrf->fname); targetf = CPVS->usrf; curline = ln; println(0,0,1); -#if !defined(MPI) && !defined(VISUAL) +#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 || isatty(0) ) #endif debug(f); @@ -768,13 +765,6 @@ void printvars(char *s,VS vs) val = eval(expr); CPVS = cpvs; if ( !err ) { -#if defined(PARI) -#if defined(PARI1) - outfile = stderr; -#else - pari_outfile = stderr; -#endif -#endif asir_out = stderr; for ( p = s; isspace(*p); p++ ); fprintf(asir_out,"%s = ",p); @@ -786,13 +776,6 @@ void printvars(char *s,VS vs) printexpr(CO,val); putc('\n',asir_out); fflush(asir_out); #if defined(VISUAL_LIB) w_noflush_stderr(0); -#endif -#if defined(PARI) -#if defined(PARI1) - outfile = stdout; -#else - pari_outfile = stdout; -#endif #endif asir_out = stdout; }