Fixes for Cygwin (see ChangeLog)

[citadel.git] / citadel / ipc_c_tcp.c

diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c
index c359fcac1f0ed13cb19711539f77757eab3c45c5..7f99b246403079c016b87eef6da67a440b16cf27 100644 (file)
--- a/citadel/ipc_c_tcp.c
+++ b/citadel/ipc_c_tcp.c
@@ -24,8 +24,13 @@
 #include <string.h>
 #include <pwd.h>
 #include <errno.h>
+#include <stdarg.h>
+#include "citadel.h"
 #include "citadel_decls.h"
 #include "ipc.h"
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
 
 /*
  * If server_is_local is set to nonzero, the client assumes that it is running
@@ -59,7 +64,7 @@ int connectsock(char *host, char *service, char *protocol)
        struct sockaddr_in sin;
        int s,type;
 
-       bzero((char *)&sin,sizeof(sin));
+       memset(&sin,0,sizeof(sin));
        sin.sin_family = AF_INET;
 
        pse=getservbyname(service,protocol);
@@ -127,7 +132,7 @@ void numericize(char *buf, char *host, char *service, char *protocol)
        struct servent *pse;
        struct sockaddr_in sin;
 
-       bzero((char *)&sin,sizeof(sin));
+       memset(&sin,0,sizeof(sin));
        sin.sin_family = AF_INET;
 
        pse=getservbyname(service,protocol);