diff options
| author | dscho <johannes.schindelin@gmx.de> | 2014-09-30 10:03:57 +0200 |
|---|---|---|
| committer | dscho <johannes.schindelin@gmx.de> | 2014-09-30 10:03:57 +0200 |
| commit | bf87073f7a971f30e41af2a140822c4774c01313 (patch) | |
| tree | 947b84172cc4002a924e777b2b627ada1f5fdabb /rfb | |
| parent | fdf5f8876f5f4bd08aa3dc47268c1f4c4590c0bb (diff) | |
| parent | fd075263f91eb3816b2e4e8584172805559ff69f (diff) | |
| download | libtdevnc-bf87073f7a971f30e41af2a140822c4774c01313.tar.gz libtdevnc-bf87073f7a971f30e41af2a140822c4774c01313.zip | |
Merge pull request #33 from danielgindi/master
More MSVC adjustments, now focuses on the libvncserver
Diffstat (limited to 'rfb')
| -rw-r--r-- | rfb/rfb.h | 4 | ||||
| -rw-r--r-- | rfb/rfbclient.h | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -52,7 +52,7 @@ extern "C" #include <sys/types.h> #endif -#ifdef __MINGW32__ +#ifdef WIN32 #undef SOCKET #include <winsock2.h> #ifdef LIBVNCSERVER_HAVE_WS2TCPIP_H @@ -267,7 +267,7 @@ typedef struct _rfbScreenInfo SOCKET listenSock; int maxSock; int maxFd; -#ifdef __MINGW32__ +#ifdef WIN32 struct fd_set allFds; #else fd_set allFds; diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h index 9ac3c37..aedb4f4 100644 --- a/rfb/rfbclient.h +++ b/rfb/rfbclient.h @@ -31,6 +31,10 @@ * @file rfbclient.h */ +#ifdef WIN32 +#define WIN32_LEAN_AND_MEAN /* Prevent loading any Winsock 1.x headers from windows.h */ +#endif + #include <stdio.h> #include <stdlib.h> #include <string.h> |