Fix winsock2.h compilation warnings

diff --git a/src/checkpoints.h b/src/checkpoints.h
index c352894..8d1f2f0 100644 (file)
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -5,8 +5,8 @@
 #define  BITCOIN_CHECKPOINT_H
 
 #include <map>
-#include "net.h"
 #include "util.h"
+#include "net.h"
 
 #define CHECKPOINT_MAX_SPAN (60 * 60) // max 1 hour before latest block
 

diff --git a/src/compat.h b/src/compat.h
index 3caa90a..3c95e37 100644 (file)
--- a/src/compat.h
+++ b/src/compat.h
@@ -12,6 +12,9 @@
 #define NOMINMAX
 #endif
 #ifndef _MSC_VER
+#ifdef FD_SETSIZE
+#undef FD_SETSIZE
+#endif
 #define FD_SETSIZE 1024 // max number of fds in fd_set
 #endif
 #include <winsock2.h>

diff --git a/src/irc.cpp b/src/irc.cpp
index 205dd7f..fb4f485 100644 (file)
--- a/src/irc.cpp
+++ b/src/irc.cpp
@@ -4,9 +4,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "irc.h"
-#include "net.h"
 #include "strlcpy.h"
 #include "base58.h"
+#include "net.h"
 
 using namespace std;
 using namespace boost;

diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp
index f2fb213..a7be633 100644 (file)
--- a/src/rpcnet.cpp
+++ b/src/rpcnet.cpp
@@ -2,12 +2,12 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "net.h"
 #include "bitcoinrpc.h"
 #include "alert.h"
 #include "wallet.h"
 #include "db.h"
 #include "walletdb.h"
+#include "net.h"
 
 using namespace json_spirit;
 using namespace std;