===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.64
retrieving revision 1.67
diff -u -p -r1.64 -r1.67
--- OpenXM_contrib2/asir2000/io/tcpf.c	2013/09/26 00:38:47	1.64
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2015/08/05 16:01:20	1.67
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.63 2013/06/13 18:40:31 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.66 2013/11/22 00:43:41 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -686,7 +686,7 @@ void ox_launch_generic(char *host,char *launcher,char 
 	STOQ(ind,*rp);
 }
 
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN32__)
 static void bslash2slash(char *buf)
 {
 	char *p;
@@ -830,7 +830,7 @@ void spawn_server(char *host,char *launcher,char *serv
 //	printf("ox_launch 127.0.0.1 %s %s %s %s 0\n",conn_str,control_port_str,server_port_str,server);
 #else
 	if ( use_unix || !host ) {
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN32__)
 		get_launcher_path(win_launcher);
 		if ( dname && strchr(dname,':') ) {
 			if ( !fork() ) {
@@ -972,7 +972,7 @@ void ox_launch_main(int with_x,NODE arg,Obj *p)
 
 void extend_mctab(int bound)
 {
-	int s,i,n;
+	int i,n;
 	struct m_c *t;
     if ( !m_c_tab ) {
         n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ;
@@ -985,7 +985,7 @@ void extend_mctab(int bound)
     }else if (bound >= m_c_s) {
         n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ;
         t = (struct m_c *)MALLOC_ATOMIC(n*sizeof(struct m_c));
-        bzero((void *)t,s);
+        bzero((void *)t,n*sizeof(struct m_c));
         bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c));
         for ( i = m_c_s; i < n; i++ ) {
             t[i].af_unix = 0;
@@ -1032,11 +1032,11 @@ int register_server(int af_unix,int m,int c,int ind)
 #endif
 	if ( m_c_i == m_c_s ) {
 		s = (m_c_s+INIT_TAB_SIZ)*sizeof(struct m_c);
-		t = (struct m_c *)MALLOC_ATOMIC(s); bzero((void *)m_c_tab,s);
+		t = (struct m_c *)MALLOC_ATOMIC(s);
 		bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c));
 		for ( i = 0; i < INIT_TAB_SIZ; i++ ) {
-			m_c_tab[m_c_s+i].af_unix = 0;
-			m_c_tab[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1;
+			t[m_c_s+i].af_unix = 0;
+			t[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1;
 		}
 		m_c_s += INIT_TAB_SIZ; m_c_tab = t;
 	}