From 381f42bcf22fdb8f6fffd0fc44fe7284c4e33774 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 10 Apr 2011 03:45:13 +0000
Subject: [PATCH] fix mingw build

---
 include/libtorrent/config.hpp |  4 ++--
 src/enum_net.cpp              | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index d4e5988e9..9e01c5f5f 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -168,10 +168,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #define TORRENT_USE_LOCALE 1
 #endif
 #define TORRENT_USE_RLIMIT 0
-#define TORRENT_USE_NETLINK 1
+#define TORRENT_USE_NETLINK 0
 #define TORRENT_USE_GETADAPTERSADDRESSES 1
 #define TORRENT_HAS_SALEN 0
-#define TORRENT_USE_GETIPFORWARDTABLE 0
+#define TORRENT_USE_GETIPFORWARDTABLE 1
 
 // ==== WINDOWS ===
 #elif defined WIN32
diff --git a/src/enum_net.cpp b/src/enum_net.cpp
index 761951c83..bab1b1154 100644
--- a/src/enum_net.cpp
+++ b/src/enum_net.cpp
@@ -43,21 +43,21 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/asio/ip/host_name.hpp>
 #endif
 
-#if defined TORRENT_BSD || defined TORRENT_SOLARIS
+#if TORREN_USE_IFCONF
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <net/if.h>
-#include <net/route.h>
 #include <string.h>
-#include <boost/scoped_array.hpp>
 #endif
 
 #if TORRENT_USE_SYSCTL
 #include <sys/sysctl.h>
+#include <net/route.h>
+#include <boost/scoped_array.hpp>
 #endif
 
-#if defined TORRENT_WINDOWS || defined TORRENT_MINGW
+#if TORRENT_USE_GETIPFORWARDTABLE || TORRENT_USE_GETADAPTERSADDRESSES
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
@@ -65,7 +65,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <iphlpapi.h>
 #endif
 
-#if defined TORRENT_LINUX
+#if TORRENT_USE_NETLINK
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
 #include <asm/types.h>
 #include <netinet/ether.h>
 #include <netinet/in.h>
@@ -73,8 +75,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <string.h>
@@ -871,6 +871,14 @@ namespace libtorrent
 			return std::vector<ip_route>();
 		}
 
+		typedef DWORD (WINAPI *GetIfEntry_t)(PMIB_IFROW pIfRow);
+		GetIfEntry_t GetIfEntry = (GetIfEntry_t)GetProcAddress(iphlp, "GetIfEntry");
+		if (!GetIfEntry)
+		{
+			ec = asio::error::operation_not_supported;
+			return std::vector<ip_route>();
+		}
+
 #if _WIN32_WINNT >= 0x0600
 		typedef DWORD (WINAPI *GetIpForwardTable2_t)(
 			ADDRESS_FAMILY, PMIB_IPFORWARD_TABLE2*);