Mercurial > hg > webserver / file diff

--- a/src/server/util/io.h	Sat Jan 14 11:27:55 2017 +0100
+++ b/src/server/util/io.h	Sun Jan 15 17:53:16 2017 +0100
@@ -42,6 +42,12 @@
 extern "C" {
 #endif
 
+#ifdef XP_UNIX
+#define SYS_SOCKET int
+#elif defined(XP_WIN32)
+#define SYS_SOCKET SOCKET
+#endif
+
 typedef struct IOStream     IOStream;
 typedef struct SysStream    SysStream;
 typedef struct HttpStream   HttpStream;
@@ -67,7 +73,7 @@
 #ifdef XP_UNIX
     int      fd;
 #elif defined(XP_WIN32)
-    SOCKET   socket;
+    SOCKET   fd;
 #endif
 };
 
@@ -89,7 +95,7 @@
 
 
 /* system stream */
-IOStream* sysstream_new(pool_handle_t *pool, int fd);
+IOStream* sysstream_new(pool_handle_t *pool, SYS_SOCKET fd);
 
 ssize_t net_sys_write(SysStream *st, void *buf, size_t nbytes);
 ssize_t net_sys_writev(SysStream *st, struct iovec *iovec, int iovcnt);