From e289b9c6ac8c1562b83b6dd6962ddd2e7488e7d5 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 20 Sep 2009 15:21:31 +0000
Subject: [PATCH] build fixes

---
 include/libtorrent/aux_/session_impl.hpp            | 1 +
 include/libtorrent/kademlia/observer.hpp            | 1 +
 include/libtorrent/kademlia/traversal_algorithm.hpp | 2 +-
 src/kademlia/dht_tracker.cpp                        | 2 ++
 src/lsd.cpp                                         | 1 +
 src/session_impl.cpp                                | 1 -
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/libtorrent/aux_/session_impl.hpp b/include/libtorrent/aux_/session_impl.hpp
index 9a363eddb..1db5ac9f2 100644
--- a/include/libtorrent/aux_/session_impl.hpp
+++ b/include/libtorrent/aux_/session_impl.hpp
@@ -78,6 +78,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/policy.hpp" // for policy::peer
 #include "libtorrent/alert.hpp" // for alert_manager
 #include "libtorrent/deadline_timer.hpp"
+#include "libtorrent/socket_io.hpp" // for print_address
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/kademlia/observer.hpp b/include/libtorrent/kademlia/observer.hpp
index 239e47cff..7f80d405f 100644
--- a/include/libtorrent/kademlia/observer.hpp
+++ b/include/libtorrent/kademlia/observer.hpp
@@ -122,6 +122,7 @@ private:
 
 	bool m_is_v6:1;
 #ifdef TORRENT_DEBUG
+public:
 	bool m_in_constructor:1;
 #endif
 };
diff --git a/include/libtorrent/kademlia/traversal_algorithm.hpp b/include/libtorrent/kademlia/traversal_algorithm.hpp
index 9f2f62eca..d14560bd4 100644
--- a/include/libtorrent/kademlia/traversal_algorithm.hpp
+++ b/include/libtorrent/kademlia/traversal_algorithm.hpp
@@ -87,7 +87,7 @@ public:
 
 protected:
 
-	traversal_algorithm::traversal_algorithm(
+	traversal_algorithm(
 		node_impl& node
 		, node_id target)
 		: m_ref_count(0)
diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp
index 8d6d555ea..a947f85a2 100644
--- a/src/kademlia/dht_tracker.cpp
+++ b/src/kademlia/dht_tracker.cpp
@@ -525,7 +525,9 @@ namespace libtorrent { namespace dht
 		int ret = lazy_bdecode(buf, buf + bytes_transferred, e);
 		if (ret != 0)
 		{
+#ifdef TORRENT_DHT_VERBOSE_LOGGING
 			TORRENT_LOG(dht_tracker) << "<== " << ep << " ERROR: Invalid bencoding";
+#endif
 			return;
 		}
 
diff --git a/src/lsd.cpp b/src/lsd.cpp
index 199e9f139..9f22fa4b3 100644
--- a/src/lsd.cpp
+++ b/src/lsd.cpp
@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/buffer.hpp"
 #include "libtorrent/http_parser.hpp"
 #include "libtorrent/escape_string.hpp"
+#include "libtorrent/socket_io.hpp" // for print_address
 
 #include <boost/bind.hpp>
 #include <boost/ref.hpp>
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index 32d7c051a..3a3d6c062 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -58,7 +58,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_DISABLE_DHT
 
 #include <libtorrent/kademlia/find_data.hpp>
-#include <libtorrent/kademlia/closest_nodes.hpp>
 #include <libtorrent/kademlia/refresh.hpp>
 #include <libtorrent/kademlia/node.hpp>
 #include <libtorrent/kademlia/observer.hpp>