===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot.c,v
retrieving revision 1.25
retrieving revision 1.29
diff -u -p -r1.25 -r1.29
--- OpenXM_contrib2/asir2000/plot/ox_plot.c	2014/05/12 16:54:41	1.25
+++ OpenXM_contrib2/asir2000/plot/ox_plot.c	2015/08/14 13:51:56	1.29
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.24 2013/12/20 02:27:17 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.28 2015/08/08 14:19:42 fujimoto Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -96,7 +96,7 @@ static void asir_do_cmd(unsigned int,unsigned int);
 static void process_ox();
 static void asir_executeFunction();
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 void ox_plot_main()
 #else
 void ox_plot_main(int argc,char **argv)
@@ -107,21 +107,20 @@ void ox_plot_main(int argc,char **argv)
 	int n;
 	int use_x;
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	ox_asir_init(argc,argv,"ox_plot");
 	use_x=init_plot_display(argc,argv);
 	if(use_x) ds=ConnectionNumber(display);
 	else fprintf(stderr,"Entering no X mode\n");
 #endif
 	if(do_message)fprintf(stderr,"I'm an ox_plot, Version %d.\n",ASIR_VERSION);
-
 	if(SETJMP(ox_env)){
 		while(NEXT(asir_infile))closecurrentinput();
 		reset_current_computation();
 		ox_send_sync(0);
 	}
 	while (1){
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 		process_ox();
 #else
 		if(ox_data_is_available(0)) process_ox();
@@ -232,7 +231,7 @@ static void asir_do_cmd(unsigned int cmd,unsigned int 
 	}
 }
 
-static void asir_executeFunction(int serial){ 
+static void asir_executeFunction(int serial){
 	char *fn;
 	int argc,id,fno;
 	FUNC f;
@@ -252,22 +251,23 @@ static void asir_executeFunction(int serial){ 
 	id=-1;
 	fno=modeNO(fn);
 	switch (fno){
-	case 0://IFPLOTD
-		id=plot(n,IFPLOT);
+	case 0://IFPLOT
+		id=plot(n,fno);
 		STOQ(id,ret);
 		asir_push_one((Obj)ret);
 		break;
 	case 1://CONPLOT
-		id=plot(n,CONPLOT);
+		id=plot(n,fno);
 		STOQ(id,ret);
 		asir_push_one((Obj)ret);
+		break;
 	case 2://PLOT
-		id=plot(n,PLOT);
+		id=plot(n,fno);
 		STOQ(id,ret);
 		asir_push_one((Obj)ret);
 		break;
 	case 4://POLARPLOT
-		id=polarplotNG(n);
+		id=plot(n,fno);
 		STOQ(id,ret);
 		asir_push_one((Obj)ret);
 		break;
@@ -306,7 +306,6 @@ static void asir_executeFunction(int serial){ 
 	case 37://CLEAR_CANVAS
 		clear_canvas(n);
 		break;
-#if defined(INTERVAL)
 // ifplotNG
 	case 36://OBJ_CP
 		id=objcp(n);
@@ -322,8 +321,10 @@ static void asir_executeFunction(int serial){ 
 	case 21://CONPLOTD
 	case 22://CONPLOTQ
 	case 23://CONPLOTB
+#if defined(INTERVAL)
 	case 24://ITVIFPLOT
-		id=ifplotNG(n,modeNO(fn));
+#endif
+		id=ifplotNG(n,fno);
 		STOQ(id,ret);
 		asir_push_one((Obj)ret);
 		break;
@@ -339,10 +340,14 @@ static void asir_executeFunction(int serial){ 
 	case 25://PLOTOVERD
 	case 26://PLOTOVERQ
 	case 27://PLOTOVERB
-		id=ifplotOP(n,modeNO(fn));
+		id=ifplotOP(n,fno);
 		STOQ(id,ret);
 		asir_push_one((Obj)ret);
 		break;
-#endif
+	case 38://POLARPLOTD
+		id=polarplotNG(n);
+		STOQ(id,ret);
+		asir_push_one((Obj)ret);
+		break;
 	}
 }