From 658b65ad0cc2045bf2c930c8ef2a2853a07ba6ee Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Wed, 1 Dec 2004 23:06:56 +0000
Subject: support MinGW32!

---
 rfb/rfb.h      | 6 +++++-
 rfb/rfbproto.h | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'rfb')

diff --git a/rfb/rfb.h b/rfb/rfb.h
index 22e2fba..16315d4 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -41,6 +41,10 @@ extern "C"
 #include <sys/types.h>
 #endif
 
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
+
 #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
 #include <pthread.h>
 #if 0 /* debugging */
@@ -208,7 +212,7 @@ typedef struct _rfbScreenInfo
     SOCKET listenSock;
     int maxSock;
     int maxFd;
-    fd_set allFds;
+    struct fd_set allFds;
 
     rfbBool socketInitDone;
     SOCKET inetdSock;
diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h
index 07d0c52..a6ff83f 100644
--- a/rfb/rfbproto.h
+++ b/rfb/rfbproto.h
@@ -47,7 +47,7 @@
  */
 
 
-#if defined(WIN32)
+#if defined(WIN32) && !defined(__MINGW32__)
 #define LIBVNCSERVER_WORDS_BIGENDIAN
 #define rfbBool int
 #include <sys/timeb.h>
@@ -65,7 +65,7 @@
 #endif
 
 
-#if !defined(WIN32)
+#if !defined(WIN32) || defined(__MINGW32__)
 #define max(a,b) (((a)>(b))?(a):(b))
 #ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
 #include <sys/time.h>
-- 
cgit v1.2.3