===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ox.h,v
retrieving revision 1.20
retrieving revision 1.24
diff -u -p -r1.20 -r1.24
--- OpenXM_contrib2/asir2000/include/ox.h	2003/12/11 05:48:04	1.20
+++ OpenXM_contrib2/asir2000/include/ox.h	2010/12/12 07:38:00	1.24
@@ -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.19 2003/12/10 05:39:57 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.23 2010/04/23 04:44:52 noro 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,7 +157,7 @@ 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__)
+#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)
@@ -303,7 +306,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();