===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v
retrieving revision 1.44
retrieving revision 1.52
diff -u -p -r1.44 -r1.52
--- OpenXM_contrib2/asir2000/builtin/ctrl.c	2014/05/27 09:53:46	1.44
+++ OpenXM_contrib2/asir2000/builtin/ctrl.c	2016/08/26 04:56:07	1.52
@@ -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.43 2014/05/26 09:34:06 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.51 2016/08/24 01:33:53 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include <string.h>
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <windows.h>
 #include <winnls.h>
 #else
@@ -84,7 +84,7 @@ struct ftab ctrl_tab[] = {
 };
 
 extern int error_in_timer;
-extern int prtime,nez,echoback,bigfloat;
+extern int prtime,nez,echoback,bigfloat,evalef;
 extern int debug_up;
 extern int GC_max_heap_size,Verbose,hideargs,hex_output,do_server_in_X11;
 extern int do_message,do_terse;
@@ -112,6 +112,7 @@ extern int diag_period;
 extern int weight_check;
 extern char **ASIRLOADPATH;
 extern int ASIRLOADPATH_LEN;
+extern int No_ox_reset;
 
 static struct {
 	char *key;
@@ -121,9 +122,8 @@ static struct {
 	{"cputime",&prtime},
 	{"nez",&nez},
 	{"echo",&echoback},
-#if defined(PARI)
 	{"bigfloat",&bigfloat},
-#endif
+	{"evalef",&evalef},
 	{"verbose",&Verbose},
 	{"quiet_mode",&do_quiet},
 	{"hideargs",&hideargs},
@@ -152,6 +152,8 @@ static struct {
 	{"no_debug_on_error",&no_debug_on_error},
 	{"diag_period",&diag_period},
 	{"weight_check",&weight_check},
+	{"no_ox_reset",&No_ox_reset},
+	{"fake_ox_reset",&No_ox_reset},
 #if defined(INTERVAL)
 	{"zerorewrite",&zerorewrite},
 	{"itvplotsize",&Itvplot},
@@ -173,6 +175,10 @@ Q *rp;
 	STRING s;
 	NODE node,p;
 	LIST list;
+	P f;
+	extern Q ox_pari_stream;
+	extern int ox_pari_stream_initialized;
+	extern P ox_pari_starting_function;
 
 	if ( !arg ) {
 		*rp = 0;
@@ -261,6 +267,39 @@ Q *rp;
 			}
 		}
 		return;
+	} else if ( !strcmp(key,"oxpari_id") ) {
+        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;
+	} else if ( !strcmp(key,"oxpari_start") ) {
+        if ( argc(arg) == 1 ) {
+			*rp = ox_pari_starting_function;
+		} else {
+			f = (Obj)ARG1(arg);
+			if ( !f || OID(f) == O_P) {
+				ox_pari_starting_function = f;
+				*rp = f;
+			}else {
+				*rp = 0;
+			}
+		}
+		return;
 	}
 	for ( i = 0; ctrls[i].key; i++ )
 		if ( !strcmp(key,ctrls[i].key) )
@@ -293,7 +332,7 @@ void Psysinfo(LIST *rp)
     MKLIST(*rp,n);
 }
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 
 static char *get_lang()
 {