summaryrefslogtreecommitdiffstats
path: root/libvncclient
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2012-05-03 17:18:22 +0200
committerChristian Beier <dontmind@freeshell.org>2012-05-03 17:18:22 +0200
commit231763cb0e93b1600923aa77f1572c55900285d7 (patch)
treeb3ca404ea77cdde141823df3634cea18bfb6bb2b /libvncclient
parent3e0cf05e12cf7af71ea15e7c946e487a62e4972a (diff)
downloadlibtdevnc-231763cb0e93b1600923aa77f1572c55900285d7.tar.gz
libtdevnc-231763cb0e93b1600923aa77f1572c55900285d7.zip
LibVNCClient: #undef these types in case it's WIN32.
The various other headers include windows.h and the winsock headers which give an error when SOCKET and socklen_t are already defined.
Diffstat (limited to 'libvncclient')
-rw-r--r--libvncclient/rfbproto.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index 70fab19..8064b56 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -35,6 +35,10 @@
#endif
#include <errno.h>
#include <rfb/rfbclient.h>
+#ifdef WIN32
+#undef SOCKET
+#undef socklen_t
+#endif
#ifdef LIBVNCSERVER_HAVE_LIBZ
#include <zlib.h>
#ifdef __CHECKER__
@@ -52,10 +56,6 @@
#include <time.h>
#ifdef LIBVNCSERVER_WITH_CLIENT_GCRYPT
-#ifdef WIN32
-#undef SOCKET
-#undef socklen_t
-#endif
#include <gcrypt.h>
#endif