Merge pull request #3081 from Diapolo/silence_compiler

prevent compiler redefinition warnings
This commit is contained in:
Wladimir J. van der Laan 2013-10-11 14:20:55 -07:00
commit c74b6c3d8f

View file

@ -6,11 +6,17 @@
#define _BITCOIN_COMPAT_H #define _BITCOIN_COMPAT_H
#ifdef WIN32 #ifdef WIN32
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif #endif
#ifdef FD_SETSIZE
#undef FD_SETSIZE // prevent redefinition compiler warning
#endif
#define FD_SETSIZE 1024 // max number of fds in fd_set #define FD_SETSIZE 1024 // max number of fds in fd_set
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>