=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.72 retrieving revision 1.75 diff -u -p -r1.72 -r1.75 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2014/05/09 19:35:51 1.72 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2015/08/08 14:19:42 1.75 @@ -44,25 +44,24 @@ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. - * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.71 2013/06/13 18:42:11 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.74 2015/08/06 10:01:52 fujimoto Exp $ */ #include "ca.h" #include "parse.h" #include "signal.h" #include "ox.h" #include "version.h" -#if defined(PARI) -#include "genpari.h" -#endif char *find_asirrc(); void ox_usr1_handler(); int asir_ox_init(); /* environement is defined in libpari.a */ +#if 0 # if !( PARI_VERSION_CODE > 131588) extern jmp_buf environnement; # endif +#endif extern int myrank_102,nserver_102; extern int do_message; @@ -167,7 +166,7 @@ void ox_main(int argc,char **argv) { extern int recv_intr; serial = ox_recv(0,&id,&obj); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( recv_intr ) { if ( recv_intr == 1 ) { recv_intr = 0; @@ -216,6 +215,9 @@ void ox_main(int argc,char **argv) { if ( do_message ) fprintf(stderr,"\n"); } +#if defined(__MINGW32__) || defined(__MINGW64__) + fflush(stderr); +#endif } static void asir_do_cmd(int cmd,unsigned int serial) @@ -706,6 +708,7 @@ int asir_executeString() SNODE snode; pointer val; char *cmd; +#if 0 #if defined(PARI) recover(0); /* environement is defined in libpari.a */ @@ -716,6 +719,7 @@ int asir_executeString() } # endif #endif +#endif cmd = ((STRING)asir_pop_one())->body; /* XXX : probably this is useless */ #if 0 @@ -947,18 +951,20 @@ void ox_asir_init(int argc,char **argv,char *servernam extern char displayname[]; static ox_asir_initialized = 0; int do_server_sav; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) int tmp; #endif GC_init(); -#if !defined(VISUAL) && !defined(MPI) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(MPI) do_server_in_X11 = 1; /* XXX */ #endif asir_save_handler(); +#if 0 #if defined(PARI) risa_pari_init(); #endif +#endif srandom((int)get_current_time()); rtime_init(); @@ -981,7 +987,7 @@ void ox_asir_init(int argc,char **argv,char *servernam sysf_init(); parif_init(); order_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) init_socket(); #endif #if defined(UINIT) @@ -1028,7 +1034,7 @@ void ox_io_init() { I_am_server = 1; endian_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( !ox_sock_id ) exit(0); iofp[0].in = WSIO_open(ox_sock_id,"r"); @@ -1058,7 +1064,7 @@ void ox_io_init() { register_server(0,0,0,-1); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) /* * Library mode functions */ @@ -1227,13 +1233,15 @@ int asir_ox_init(int byteorder) static ox_asir_initialized = 0; GC_init(); -#if !defined(VISUAL) && !defined(MPI) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(MPI) do_server_in_X11 = 0; /* XXX */ #endif asir_save_handler(); +#if 0 #if defined(PARI) risa_pari_init(); #endif +#endif srandom((int)get_current_time()); rtime_init(); @@ -1250,7 +1258,7 @@ int asir_ox_init(int byteorder) pf_init(); sysf_init(); parif_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) init_socket(); #endif #if defined(UINIT)