summaryrefslogtreecommitdiffstats
path: root/libvncserver/httpd.c
diff options
context:
space:
mode:
authorDaniel Cohen Gindi <danielgindi@gmail.com>2014-09-20 17:16:52 +0300
committerDaniel Cohen Gindi <danielgindi@gmail.com>2014-09-20 17:46:33 +0300
commit901eba9f4608de6af231fde34264ede878c4d253 (patch)
tree5f75406c2fad59e6148010948a5c3d23088bf6f0 /libvncserver/httpd.c
parent8c58593649f385a8bbaafefc768181d7a24c463d (diff)
downloadlibtdevnc-901eba9f4608de6af231fde34264ede878c4d253.tar.gz
libtdevnc-901eba9f4608de6af231fde34264ede878c4d253.zip
Generally adjusting headers for compiling on windows without the mixing of Winsock 1 and 2.
Diffstat (limited to 'libvncserver/httpd.c')
-rw-r--r--libvncserver/httpd.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libvncserver/httpd.c b/libvncserver/httpd.c
index 5bac9f9..12d71a8 100644
--- a/libvncserver/httpd.c
+++ b/libvncserver/httpd.c
@@ -43,8 +43,15 @@
#include <errno.h>
#ifdef WIN32
-#include <winsock.h>
+#include <io.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
#define close closesocket
+#if defined(_MSC_VER)
+#include <BaseTsd.h> /* For the missing ssize_t */
+#define ssize_t SSIZE_T
+#define read _read /* Prevent POSIX deprecation warnings */
+#endif
#else
#ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
#include <sys/time.h>