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
shared:BOOST_ASIO_DYN_LINK
- static:BOOST_ASIO_SEPARATE_COMPILATION
+ BOOST_ASIO_SEPARATE_COMPILATION
@tag
;
@@ -596,6 +596,8 @@ lib torrent
# to declare the symbol as being exported
shared,static:BOOST_ASIO_SOURCE
shared,static:BOOST_SYSTEM_SOURCE
+ shared,static:BOOST_ALL_DYN_LINK
+ shared:BOOST_ALL_DYN_LINK
on:src/kademlia/$(KADEMLIA_SOURCES).cpp
logging:src/kademlia/$(KADEMLIA_SOURCES).cpp
@@ -610,6 +612,7 @@ lib torrent
: # usage requirements
$(usage-requirements)
+ shared: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);