From b022772b4d2d8e3cfa0613174dd4f09dd22b5e8c Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 3 Jun 2012 05:13:08 +0000
Subject: [PATCH] merged fix from RC_0_16

---
 Jamfile                              | 5 ++++-
 include/libtorrent/escape_string.hpp | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Jamfile b/Jamfile
index acf30f2db..f75540a9b 100755
--- a/Jamfile
+++ b/Jamfile
@@ -575,7 +575,7 @@ local usage-requirements =
 # make sure asio symbols are properly exported
 # and imported
 	<link>shared:<define>BOOST_ASIO_DYN_LINK
-	<link>static:<define>BOOST_ASIO_SEPARATE_COMPILATION
+	<define>BOOST_ASIO_SEPARATE_COMPILATION
 	<tag>@tag
 	;
 
@@ -596,6 +596,8 @@ lib torrent
 	# to declare the symbol as being exported
 	<link>shared,<boost-link>static:<define>BOOST_ASIO_SOURCE
 	<link>shared,<boost-link>static:<define>BOOST_SYSTEM_SOURCE
+	<link>shared,<boost-link>static:<define>BOOST_ALL_DYN_LINK
+	<link>shared:<define>BOOST_ALL_DYN_LINK
 
 	<dht-support>on:<source>src/kademlia/$(KADEMLIA_SOURCES).cpp
 	<dht-support>logging:<source>src/kademlia/$(KADEMLIA_SOURCES).cpp
@@ -610,6 +612,7 @@ lib torrent
 
 	: # usage requirements
 	$(usage-requirements)
+	<link>shared:<define>TORRENT_LINKING_SHARED
 	;
 
 headers = [ path.glob-tree include/libtorrent : *.hpp ] ;
diff --git a/include/libtorrent/escape_string.hpp b/include/libtorrent/escape_string.hpp
index feb7ccbfe..526bfd1d3 100644
--- a/include/libtorrent/escape_string.hpp
+++ b/include/libtorrent/escape_string.hpp
@@ -80,10 +80,10 @@ namespace libtorrent
 	TORRENT_EXTRA_EXPORT void convert_path_to_posix(std::string& path);
 
 	TORRENT_EXTRA_EXPORT std::string read_until(char const*& str, char delim, char const* end);
-	TORRENT_EXTRA_EXPORT std::string to_hex(std::string const& s);
-	TORRENT_EXTRA_EXPORT bool is_hex(char const *in, int len);
-	TORRENT_EXTRA_EXPORT void to_hex(char const *in, int len, char* out);
-	TORRENT_EXTRA_EXPORT bool from_hex(char const *in, int len, char* out);
+	TORRENT_EXPORT std::string to_hex(std::string const& s);
+	TORRENT_EXPORT bool is_hex(char const *in, int len);
+	TORRENT_EXPORT void to_hex(char const *in, int len, char* out);
+	TORRENT_EXPORT bool from_hex(char const *in, int len, char* out);
 
 #if defined TORRENT_WINDOWS && TORRENT_USE_WSTRING
 	TORRENT_EXTRA_EXPORT std::wstring convert_to_wstring(std::string const& s);