move wincompat headers to include path and add to make install

[catta] / src / compat / windows / wincompat.c

diff --git a/src/compat/windows/wincompat.c b/src/compat/windows/wincompat.c
index 98bc2d788aac5222f4007b8d7cb5e76fb7103a2a..b60eb8f66ccd2f5e4574f2ca53edf60729ef0573 100644 (file)
--- a/src/compat/windows/wincompat.c
+++ b/src/compat/windows/wincompat.c
@@ -1,4 +1,4 @@
-#include "wincompat.h"
+#include "catta/compat/wincompat.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -138,12 +138,6 @@ ssize_t recvmsg(int sockfd, struct msghdr *msg, int flags)
     msg->msg_flags = (int)wsamsg.dwFlags;
         // all flags that fit into dwFlags also fit into msg_flags (see above)
 
-    // XXX debug, remove
-    {
-        char where[64];
-        getnameinfo(msg->msg_name, msg->msg_namelen, where, sizeof(where), NULL, 0, NI_NUMERICHOST);
-        catta_log_debug("recvmsg: %u bytes from %s", (unsigned int)bytesrcvd, where);
-    }
     return bytesrcvd;
 }
 
@@ -220,12 +214,6 @@ ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags)
         return -1;
     }
 
-    // XXX debug, remove
-    {
-        char where[64];
-        getnameinfo(msg->msg_name, msg->msg_namelen, where, sizeof(where), NULL, 0, NI_NUMERICHOST);
-        catta_log_debug("sendmsg: %u bytes to %s", (unsigned int)bytessent, where);
-    }
     return bytessent;
 }
 
@@ -249,11 +237,11 @@ int ioctl(int d, unsigned long request, int *p)
 
 int pipe(int pipefd[2])
 {
-    int lsock = INVALID_SOCKET;
+    int lsock = (int)INVALID_SOCKET;
     struct sockaddr_in laddr;
     socklen_t laddrlen = sizeof(laddr);
 
-    pipefd[0] = pipefd[1] = INVALID_SOCKET;
+    pipefd[0] = pipefd[1] = (int)INVALID_SOCKET;
 
     // bind a listening socket to a TCP port on localhost
     laddr.sin_family = AF_INET;
@@ -306,7 +294,8 @@ int uname(struct utsname *buf)
     strncpy(buf->version, "unknown", sizeof(buf->sysname)-1);   // we don't need it
 
     // computer (node) name
-    if(GetComputerName(buf->nodename, sizeof(buf->nodename)-1) == 0) {
+    DWORD nodename_size = sizeof(buf->nodename)-1;
+    if(GetComputerName(buf->nodename, &nodename_size) == 0) {
         errno = EFAULT;
         return -1;
     }