=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v retrieving revision 1.46 retrieving revision 1.49 diff -u -p -r1.46 -r1.49 --- OpenXM_contrib2/asir2000/builtin/ctrl.c 2015/08/04 06:20:44 1.46 +++ OpenXM_contrib2/asir2000/builtin/ctrl.c 2016/03/31 06:41:20 1.49 @@ -45,12 +45,12 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.45 2014/09/19 01:25:59 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.48 2015/08/14 13:51:54 fujimoto Exp $ */ #include "ca.h" #include "parse.h" #include -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include #include #else @@ -172,6 +172,8 @@ Q *rp; STRING s; NODE node,p; LIST list; + extern Q ox_pari_stream; + extern int ox_pari_stream_initialized; if ( !arg ) { *rp = 0; @@ -260,6 +262,27 @@ Q *rp; } } return; + } else if ( !strcmp(key,"oxpari_id") ) { + *rp = 0; + if ( argc(arg) == 1 ) { + if(!ox_pari_stream_initialized) { + t=-1; + STOQ(t,*rp); + }else { + *rp = ox_pari_stream; + } + }else { + c = (Q)ARG1(arg); + if ( !c || ( NUM(c) && INT(c) && SGN(c)>0 ) ) { + ox_pari_stream_initialized = 1; + ox_pari_stream = c; + *rp = c; + }else { + t=-1; + STOQ(t,*rp); + } + } + return; } for ( i = 0; ctrls[i].key; i++ ) if ( !strcmp(key,ctrls[i].key) ) @@ -292,7 +315,7 @@ void Psysinfo(LIST *rp) MKLIST(*rp,n); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) static char *get_lang() {