summaryrefslogtreecommitdiffstats
path: root/rfb/rfbproto.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2014-09-02 16:52:09 +0200
committerJohannes Schindelin <johannes.schindelin@gmx.de>2014-09-02 16:52:09 +0200
commit70783a4d60086f1a706bbbd8dedbc3b31a4a19a0 (patch)
tree70764988d22bc5eb501f04ed4d1188b2e16f1b8b /rfb/rfbproto.h
parent50dbe1df75d983cf7d69874383445fdff18de5a3 (diff)
parent54b2400dd761f484c9a5ac4cb63ac63fa1f6b503 (diff)
downloadlibtdevnc-70783a4d60086f1a706bbbd8dedbc3b31a4a19a0.tar.gz
libtdevnc-70783a4d60086f1a706bbbd8dedbc3b31a4a19a0.zip
Merge branch 'msvc'
This topic branch provides compatibility for Windows, without the MINGW32 dependency. It is based on https://github.com/LibVNC/libvncserver/pull/22. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 'rfb/rfbproto.h')
-rw-r--r--rfb/rfbproto.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h
index fe46c3e..4169fd6 100644
--- a/rfb/rfbproto.h
+++ b/rfb/rfbproto.h
@@ -65,7 +65,7 @@
#define LIBVNCSERVER_WORDS_BIGENDIAN
#define rfbBool int
#include <sys/timeb.h>
-#include <winsock.h>
+#include <winsock2.h>
#undef SOCKET
#define SOCKET int
#else
@@ -108,6 +108,10 @@ typedef int8_t rfbBool;
#define TRUE -1
#endif
+#ifdef _MSC_VER
+#include <stdint.h>
+#endif
+
typedef uint32_t rfbKeySym;
typedef uint32_t rfbPixel;