From 066cbf1a9f7a71fd4222441683acb237112cd09f Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 2 Dec 2014 10:18:07 +0000
Subject: [PATCH] merged changes from RC_1_0

---
 bindings/python/Jamfile |  9 +++++----
 src/asio_ssl.cpp        | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/bindings/python/Jamfile b/bindings/python/Jamfile
index ed56dc706..f264a5300 100755
--- a/bindings/python/Jamfile
+++ b/bindings/python/Jamfile
@@ -20,7 +20,8 @@ rule libtorrent_linking ( properties * )
 {
     local result ;
 
-    if <target-os>linux && <toolset>gcc in $(properties)
+    if ! <target-os>windows in $(properties)
+        && <toolset>gcc in $(properties)
     {
         result += <libtorrent-python-pic>on ;
     }
@@ -40,9 +41,9 @@ rule libtorrent_linking ( properties * )
 
     if <boost>source in $(properties)
     {
-	# linux must link dynamically against boost python because it pulls
-	# in libpthread, which must be linked dynamically since we're building a .so
-	# (the static build of libpthread is not position independent)
+        # linux must link dynamically against boost python because it pulls
+        # in libpthread, which must be linked dynamically since we're building a .so
+        # (the static build of libpthread is not position independent)
         if <boost-link>shared in $(properties) || <target-os>linux in $(properties)
         {
             result += <library>/boost/python//boost_python/<link>shared ;
diff --git a/src/asio_ssl.cpp b/src/asio_ssl.cpp
index e4a953ef7..f762048e3 100644
--- a/src/asio_ssl.cpp
+++ b/src/asio_ssl.cpp
@@ -2,6 +2,20 @@
 #include <boost/version.hpp>
 #include <climits>
 
+#ifndef BOOST_ASIO_SOURCE
+#define BOOST_ASIO_SOURCE
+#endif
+
+#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 >= 104610
 #include <boost/asio/ssl/impl/src.hpp>
 #endif