===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxKan0.h,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -p -r1.6 -r1.11
--- OpenXM/src/kan96xx/plugin/oxKan0.h	2003/11/18 11:08:27	1.6
+++ OpenXM/src/kan96xx/plugin/oxKan0.h	2004/09/17 08:46:10	1.11
@@ -1,8 +1,8 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/oxKan0.h,v 1.5 2002/11/08 02:54:11 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/oxKan0.h,v 1.10 2004/09/17 07:27:28 takayama Exp $ */
 /* ox_kan0.h */
 
-#define mymalloc(n) malloc(n)
-#define myfree(p) free(p)
+#define mymalloc(n) sGC_malloc(n)
+#define myfree(p) sGC_free(p)
 typedef FILE2 *  ox_stream;
 
 int socketOpen(char *serverName,int portNumber);
@@ -87,10 +87,11 @@ int oxclientMultiSelect(oxclientp clients[],int datare
 int oxInitClient(oxclientp c);
 int oxGetControl(oxclientp client);
 int oxIsThereErrorClient(oxclientp client);  /* 1 : error, 0 : OK. */
-oxclientp oxCreateClient(char *ipname,int portStream,int portControl);
+oxclientp oxCreateClient(char *ipname,int portStream,int portControl,
+                         char *passControl,char *passData);
 oxclientp oxCreateClientFile(char *fileName,char *mode,char *controlFileName,char *cmode);
 oxclientp oxCreateClient2(int fdstream,int portStream,
-			  int fdcontrol,int portControl,int ipmask,char *pass);
+			  int fdcontrol,int portControl,int ipmask,char *cpass,char *dpass);
 int oxSetByteOrder(int fd);
 int oxTellMyByteOrder(int fdOut,int fdIn);
 
@@ -138,6 +139,7 @@ void oxReqSetName(ox_stream os,char *name);
 void oxReqEvalName(ox_stream os,char *name);
 void oxReqExecuteStringByLocalParser(ox_stream os,char *s);
 void oxReqExecuteFunction(ox_stream os,char *s);
+void oxReqExecuteFunctionWithOptionalArgument(ox_stream os,char *s);
 void oxReqPopString(ox_stream os);
 void oxReqPushString(ox_stream os,char *s);
 void oxReqPopCMO(ox_stream os);
@@ -153,3 +155,5 @@ int oxRemovePortFile(void);
 
 #define MAX_N_OF_CLIENT 1024
 int oxGetClientID();
+
+char *oxFIDtoStr(int id);