aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-10-11 14:20:55 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2013-10-11 14:20:55 -0700
commitc74b6c3d8fcc1750fa0861ae851b353a7f3495d2 (patch)
treea78139bad0f1fa77028b55e8025e153e4e314670 /src
parent56c0ba7a0f893c71eb871b95f36c18e37407bf00 (diff)
parent733511eda044637cf2f4381ff610f803b55785a0 (diff)
Merge pull request #3081 from Diapolo/silence_compiler
prevent compiler redefinition warnings
Diffstat (limited to 'src')
-rw-r--r--src/compat.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compat.h b/src/compat.h
index 9caf5e4810..b126df901a 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -6,11 +6,17 @@
#define _BITCOIN_COMPAT_H
#ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
#define _WIN32_WINNT 0x0501
#define WIN32_LEAN_AND_MEAN 1
#ifndef NOMINMAX
#define NOMINMAX
#endif
+#ifdef FD_SETSIZE
+#undef FD_SETSIZE // prevent redefinition compiler warning
+#endif
#define FD_SETSIZE 1024 // max number of fds in fd_set
#include <winsock2.h>
#include <ws2tcpip.h>