merged visibility fix from RC_0_16

This commit is contained in:
Arvid Norberg 2012-12-15 05:09:11 +00:00
parent 1422f5a1ba
commit 0a07f75ee0
2 changed files with 11 additions and 1 deletions

View File

@ -264,7 +264,7 @@ rule building ( properties * )
# in shared object interfaces, so when it's
# enabled, just export everything (since we're)
# probably not a production build anyway
&& !<debug-iterators>on in $(properties)
&& ! <debug-iterators>on in $(properties)
{
# hide non-external symbols
# use ms-compat because boost.asio (as of 1.47.0

View File

@ -79,6 +79,16 @@
#else // _MSC_VER
#include "libtorrent/config.hpp"
#define TORRENT_HAS_ASIO_DECL x ## BOOST_ASIO_DECL
// only define BOOST_ASIO_DECL if it hasn't already been defined
// or if it has been defined to an empty string
#if TORRENT_HAS_ASIO_DECL == x
#define BOOST_ASIO_DECL BOOST_SYMBOL_EXPORT
#endif
#if BOOST_VERSION >= 104500
#include <boost/asio/impl/src.hpp>
#elif BOOST_VERSION >= 104400