=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v retrieving revision 1.35 retrieving revision 1.38 diff -u -p -r1.35 -r1.38 --- OpenXM_contrib2/asir2000/parse/main.c 2014/05/09 19:35:52 1.35 +++ OpenXM_contrib2/asir2000/parse/main.c 2015/08/14 13:51:56 1.38 @@ -45,13 +45,13 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.34 2013/12/19 05:48:24 saito Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.37 2015/08/06 10:01:53 fujimoto Exp $ */ #include "ca.h" #include "parse.h" #include -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include #define R_OK 4 #else @@ -59,15 +59,6 @@ #include #endif -#if defined(PARI) -#include "genpari.h" - -/* XXX : environment is defined in libpari.a */ -# if !(PARI_VERSION_CODE > 131588) -extern jmp_buf environnement; -# endif -#endif - extern JMP_BUF main_env; #ifndef ASIRRCNAME @@ -101,7 +92,7 @@ char *find_asirrc() return name; } } -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) env = getenv("HOMEDRIVE"); env2 = getenv("HOMEPATH"); if ( env && env2 ) { @@ -129,7 +120,7 @@ char *find_asirrc() #if defined(VISUAL_LIB) void Main(int argc,char *argv[]) #else -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) void #endif main(int argc,char *argv[]) @@ -144,7 +135,7 @@ main(int argc,char *argv[]) extern int asir_setenv; extern FILE *in_fp; extern int *StackBottom; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) char *slash,*bslash,*binname,*p; #endif @@ -164,7 +155,7 @@ main(int argc,char *argv[]) exit(0); } else ox_mpi_master_init(); -#elif !defined(VISUAL) +#elif !defined(VISUAL) && !defined(__MINGW32__) slash = (char *)rindex(argv[0],'/'); bslash = (char *)rindex(argv[0],'\\'); if ( slash ) @@ -200,9 +191,6 @@ main(int argc,char *argv[]) endian_init(); cppname_init(); process_args(--argc,++argv); -#if defined(PARI) - risa_pari_init(); -#endif if (!do_quiet) { copyright(); } @@ -218,7 +206,7 @@ main(int argc,char *argv[]) parif_init(); order_init(); /* XXX set the default ordering */ -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) init_socket(); #endif #if defined(UINIT) @@ -240,16 +228,6 @@ main(int argc,char *argv[]) prompt(); while ( 1 ) { -#if defined(PARI) - recover(0); - /* XXX environement is defined in libpari.a */ -# if !(PARI_VERSION_CODE > 131588) - if ( setjmp(environnement) ) { - avma = top; recover(1); - resetenv(""); - } -# endif -#endif if ( SETJMP(main_env) ) prompt(); if ( !do_file ) { @@ -272,7 +250,7 @@ void set_error(int code,char *reason,char *action) void set_stacksize() { -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) struct rlimit rlim; int c,m;