From bcb22239bf234d97c5c6faa1a5c8b4d666f4df7a Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Mon, 23 Jul 2012 13:59:17 +0000
Subject: [PATCH] polish windows build

---
 Jamfile                       |  2 --
 include/libtorrent/config.hpp | 13 ++++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Jamfile b/Jamfile
index 746d0d511..04473939f 100755
--- a/Jamfile
+++ b/Jamfile
@@ -587,7 +587,6 @@ lib torrent
 	src/$(SOURCES).cpp
 
 	: # requirements
-	<define>BOOST_THREAD_USE_LIB
 	<threading>multi
 	<link>shared:<define>TORRENT_BUILDING_SHARED
 
@@ -596,7 +595,6 @@ lib torrent
 	# to declare the symbol as being exported
 	<link>shared:<define>BOOST_ASIO_SOURCE
 	<link>shared:<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
diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index da753fd9c..ec9f50ff4 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -49,11 +49,18 @@ POSSIBILITY OF SUCH DAMAGE.
 	build, to automatically apply these defines
 #endif
 
+#if !defined _MSC_VER || _MSC_VER >= 1600
+#include <stdint.h> // for INT64_MAX
+#else
+#if !defined INT64_MAX
+#define INT64_MAX 0x7fffffffffffffffLL
+#endif
+#endif
+
 #ifndef _MSC_VER
 #define __STDC_FORMAT_MACROS 1
 #define __STDC_LIMIT_MACROS 1
 #include <inttypes.h> // for PRId64 et.al.
-#include <stdint.h> // for INT64_MAX
 #endif
 
 #ifndef PRId64
@@ -69,10 +76,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif
 
-#if !defined INT64_MAX
-#define INT64_MAX 0x7fffffffffffffffLL
-#endif
-
 // backwards compatibility with older versions of boost
 #if !defined BOOST_SYMBOL_EXPORT && !defined BOOST_SYMBOL_IMPORT
 # if defined _MSC_VER || defined __MINGW32__