summaryrefslogtreecommitdiffstats
path: root/rfb
diff options
context:
space:
mode:
authordscho <dscho>2004-12-01 23:06:56 +0000
committerdscho <dscho>2004-12-01 23:06:56 +0000
commit658b65ad0cc2045bf2c930c8ef2a2853a07ba6ee (patch)
tree51a7b1f153204de2c3bc423411d8f5b2f566c4f6 /rfb
parent7d3b1c9762b5f2878e9783677677cb2b3aa10e7e (diff)
downloadlibtdevnc-658b65ad0cc2045bf2c930c8ef2a2853a07ba6ee.tar.gz
libtdevnc-658b65ad0cc2045bf2c930c8ef2a2853a07ba6ee.zip
support MinGW32!
Diffstat (limited to 'rfb')
-rw-r--r--rfb/rfb.h6
-rw-r--r--rfb/rfbproto.h4
2 files changed, 7 insertions, 3 deletions
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>