Merge pull request #3081 from Diapolo/silence_compiler

prevent compiler redefinition warnings
11 years ago · c74b6c3d8f
1 changed files with 6 additions and 0 deletions
--- a/src/compat.h
+++ b/src/compat.h
@ -6,11 +6,17 @@
				@@ -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>