===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ox.h,v
retrieving revision 1.21
retrieving revision 1.27
diff -u -p -r1.21 -r1.27
--- OpenXM_contrib2/asir2000/include/ox.h	2004/01/25 11:54:09	1.21
+++ OpenXM_contrib2/asir2000/include/ox.h	2015/08/12 10:45:12	1.27
@@ -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/include/ox.h,v 1.20 2003/12/11 05:48:04 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.26 2015/08/06 10:01:52 fujimoto Exp $ 
 */
 #include "com.h"
 
@@ -145,6 +145,9 @@
 
 #define SM_nop 300
 
+/* local SM command in ox_asir */
+#define SM_executeFunctionSync 400
+
 #define SM_control_kill 				1024
 #define SM_control_intr 				1025
 #define SM_control_reset_connection		1030
@@ -154,11 +157,11 @@ typedef FILE *ox_stream;
 /* a macro to check whether data are available in the read buffer */
 #if defined(linux)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_IO_read_ptr < (fp)->_IO_read_end)
-#elif defined(__FreeBSD__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__INTERIX)
+#elif defined(__FreeBSD__) || defined(__DARWIN__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__INTERIX)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_r)
 #elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(_IBMR2)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_cnt)
-#elif defined(VISUAL)
+#elif defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->p < (fp)->buf_size)
 #elif defined(hpux)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->__cnt)
@@ -198,6 +201,7 @@ void read_cmo_dp(FILE *s,DP *rp);
 void read_cmo_list(FILE *s,Obj *rp);
 void read_cmo_zz(FILE *s,int *sgn,N *rp);
 void read_cmo_uint(FILE *s,USINT *rp);
+void read_cmo_bf(FILE *s,BF *q);
 void read_cmo(FILE *s,Obj *rp);
 void write_cmo_tree(FILE *s,LIST l);
 void write_cmo_error(FILE *s,ERR e);
@@ -212,7 +216,9 @@ void write_cmo_p(FILE *s,P p);
 void write_cmo_zz(FILE *s,int sgn,N n);
 void write_cmo_real(FILE *s,Real real);
 void write_cmo_q(FILE *s,Q q);
+void write_cmo_bf(FILE *s,BF q);
 void write_cmo_uint(FILE *s,USINT ui);
+void write_cmo_matrix_as_list(FILE *s,MAT m);
 void write_cmo_mathcap(FILE *s,MATHCAP mc);
 int cmo_tag(Obj obj,int *tag);
 void write_cmo(FILE *s,Obj obj);
@@ -273,6 +279,7 @@ int gen_fwrite (char *ptr,int size,int nitems,FILE *st
 void write_char(FILE *f,unsigned char *p);
 void write_short(FILE *f,unsigned short *p);
 void write_int(FILE *f,unsigned int *p);
+void write_int64(FILE *f,UL *p);
 void init_deskey();
 void write_intarray(FILE *f,unsigned int *p,int l);
 void write_longarray(FILE *f,unsigned long *p,int l);
@@ -281,6 +288,7 @@ void write_string(FILE *f,unsigned char *p,int l);
 void read_char(FILE *f,unsigned char *p);
 void read_short(FILE *f,unsigned short *p);
 void read_int(FILE *f,unsigned int *p);
+void read_int64(FILE *f,UL *p);
 void read_intarray(FILE *f,unsigned int *p,int l);
 void read_longarray(FILE *f,unsigned long *p,int l);
 void read_string(FILE *f,unsigned char *p,int l);
@@ -303,7 +311,7 @@ void spawn_server(char *host,char *launcher,char *serv
 	int use_unix,int use_ssh,int use_x,int conn_to_serv,
 	char *control_port_str,char *server_port_str);
 void ox_launch_main(int with_x,NODE arg,Obj *p);
-int register_server(int af_unix,int m,int c);
+int register_server(int af_unix,int m,int c,int fd);
 int get_mcindex(int i);
 void shutdown_all();