From 1c91903c9c35c32de285331067370c979a3432c0 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 27 Nov 2014 03:05:06 +0000
Subject: [PATCH] merged fixes from RC_1_0

---
 CMakeLists.txt              | 6 ++++--
 Makefile.am                 | 4 ----
 bindings/python/Makefile.am | 1 +
 bindings/python/setup.py    | 4 ++--
 src/broadcast_socket.cpp    | 5 +----
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41dd8735c..139409606 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,8 +255,10 @@ endif()
 
 if (WIN32)
 	target_link_libraries(torrent-rasterbar wsock32 ws2_32)
-	add_definitions(-D_WIN32_WINNT=0x0500)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # multicore compilation
+	add_definitions(-D_WIN32_WINNT=0x0600)
+	if (MSVC)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # multicore compilation
+	endif()
 endif()
 
 if (encryption)
diff --git a/Makefile.am b/Makefile.am
index 8838834d3..48b684ea6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,10 +121,6 @@ EXTRA_DIST = \
   Jamroot.jam \
   CMakeLists.txt \
   LICENSE \
-  bindings/python/compile_flags  \
-  bindings/python/link_flags  \
-  libtorrent-rasterbar.pc  \
-  libtorrent-rasterbar-cmake.pc  \
   $(DOCS_PAGES) \
   $(DOCS_IMAGES) \
   $(ED25519_SOURCE)
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index db08e1557..b7e6a9843 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = \
   simple_client.py          \
   make_torrent.py           \
   src/alert.cpp             \
+  src/bytes.hpp             \
   src/big_number.cpp        \
   src/converters.cpp        \
   src/create_torrent.cpp    \
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index b938d7360..944b469d6 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -68,10 +68,10 @@ if '--bjam' in sys.argv or ldflags == None or extra_cmd == None:
 			toolset = ' msvc-9.0'
 			file_ext = '.pyd'
 
-		parallell_builds = ' -j%d' % multiprocessing.cpu_count()
+		parallel_builds = ' -j%d' % multiprocessing.cpu_count()
 
 		# build libtorrent using bjam and build the installer with distutils
-		cmdline = 'bjam boost=source link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + toolset + parallell_builds
+		cmdline = 'bjam boost=source link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + toolset + parallel_builds
 		print(cmdline)
 		if os.system(cmdline) != 0:
 			print('build failed')
diff --git a/src/broadcast_socket.cpp b/src/broadcast_socket.cpp
index e8cd79990..e44dcb722 100644
--- a/src/broadcast_socket.cpp
+++ b/src/broadcast_socket.cpp
@@ -260,11 +260,8 @@ namespace libtorrent
 			ec = error_code();
 
 			// if_nametoindex was introduced in vista
-			// and apparently msvc-9.0 doesn't support this, even though
-			// the _WIN32_WINNT version indicates vista+
 #if TORRENT_USE_IPV6 \
-		&& (!defined TORRENT_WINDOWS \
-			|| (_WIN32_WINNT >= _WIN32_WINNT_VISTA && _MSC_VER > 1500)) \
+		&& (!defined TORRENT_WINDOWS || _WIN32_WINNT >= 0x0600) \
 		&& !defined TORRENT_MINGW
 
 			if (i->interface_address.is_v6() &&