From 231763cb0e93b1600923aa77f1572c55900285d7 Mon Sep 17 00:00:00 2001
From: Christian Beier <dontmind@freeshell.org>
Date: Thu, 3 May 2012 17:18:22 +0200
Subject: [PATCH] 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.
---
 libvncclient/rfbproto.c | 8 ++++----
 1 file 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