From 1e12b50b2421f76071925513006d7674cb8eef15 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 30 Nov 2014 00:30:30 +0000
Subject: [PATCH] merge changes from RC_1_0

---
 ChangeLog         | 3 +++
 test/test_dht.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b00f331da..bbd2951a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
 
 1.0.3 release
 
+	* python binding build fix for boost-1.57.0
+	* add --enable-export-all option to configure script, to export all symbols
+	  from libtorrent
 	* fix if_nametoindex build error on windows
 	* handle overlong utf-8 sequences
 	* fix link order bug in makefile for python binding
diff --git a/test/test_dht.cpp b/test/test_dht.cpp
index 520e7fffa..48cb8425b 100644
--- a/test/test_dht.cpp
+++ b/test/test_dht.cpp
@@ -797,7 +797,7 @@ int test_main()
 
 		TEST_CHECK(ret);
 
-		std::pair<const char*, int> salt(NULL, 0);
+		std::pair<const char*, int> salt((char*)0, 0);
 		if (with_salt)
 			salt = std::pair<char const*, int>("foobar", 6);