===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.11
retrieving revision 1.13
diff -u -p -r1.11 -r1.13
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2001/12/28 08:18:22	1.11
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2002/11/07 13:32:06	1.13
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.10 2001/08/10 13:48:39 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.12 2002/02/24 10:27:20 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -611,7 +611,6 @@ int oxIsThereErrorClient(oxclientp client) {
 oxclientp oxCreateClient(char *sname,int portStream,int portControl)
      /* you also need to change oxCreateClient2. */
 {
-  static int clnum = 0;
   int v = 0;
   int fdControl = -1;
   int fdStream = -1;
@@ -654,7 +653,7 @@ oxclientp oxCreateClient(char *sname,int portStream,in
   client->dataport = portStream;
   client->controlport = portControl;
   client->controlfd = fdControl;
-  client->id = clnum; clnum++;
+  client->id = oxGetClientID();
   client->type = CLIENT_SOCKET; /* socket */
   client->engineByteOrder = engineByteOrder;
   client->controlByteOrder = controlByteOrder;
@@ -883,16 +882,23 @@ char *oxGenPass(void) {
 
 
 static void cancelConnection() {
+#if defined(__CYGWIN__)
+  extern sigjmp_buf MyEnv_oxmisc;
+#else
   extern jmp_buf MyEnv_oxmisc;
+#endif
   signal(SIGALRM,SIG_IGN);
   fprintf(stderr,"Time out in TCP/IP connection.\n");
+#if defined(__CYGWIN__)
+  siglongjmp(MyEnv_oxmisc,1);
+#else
   longjmp(MyEnv_oxmisc,1);
+#endif
 }
 
 oxclientp oxCreateClient2(int fdstream,int portStream,
                           int fdcontrol,int portControl,int ipmask,char *pass)
 {
-  static int clnum = 0;
   int v = 0;
   int fdControl = -1;
   int fdStream = -1;
@@ -900,11 +906,19 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
 
   char *s;
   oxclientp client;
-  extern jmp_buf MyEnv_oxmisc ;
+#if defined(__CYGWIN__)
+  extern sigjmp_buf MyEnv_oxmisc;
+#else
+  extern jmp_buf MyEnv_oxmisc;
+#endif
   int controlByteOrder, engineByteOrder;
 
   v = !Quiet;
+#if defined(__CYGWIN__)
+  if (sigsetjmp(MyEnv_oxmisc,1)) {
+#else
   if (setjmp(MyEnv_oxmisc)) {
+#endif
     return(NULL);
   }else{
   }
@@ -970,7 +984,7 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
   client->dataport = portStream;
   client->controlport = portControl;
   client->controlfd = fdControl;
-  client->id = clnum; clnum++;
+  client->id = oxGetClientID();
   client->type = CLIENT_SOCKET; /* socket */
   client->engineByteOrder = engineByteOrder;
   client->controlByteOrder = controlByteOrder;