merged changes from RC_1_0

include/libtorrent/http_parser.hpp

@@ -62,7 +62,7 @@ namespace libtorrent
 	// return true if the status code is a redirect
 	bool is_redirect(int http_status);
 
-	std::string resolve_redirect_location(std::string referrer
+	TORRENT_EXTRA_EXPORT std::string resolve_redirect_location(std::string referrer
 		, std::string location);
 
 	class TORRENT_EXTRA_EXPORT http_parser

test/test.hpp

@@ -50,19 +50,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #define EXPORT
 #endif
 
-// the unit tests need access to these.
-// they are built into the unit test library as well.
-// not exported from libtorrent itself
-extern "C"
-{
-	int EXPORT ed25519_create_seed(unsigned char *seed);
-	void EXPORT ed25519_create_keypair(unsigned char *public_key, unsigned char *private_key, const unsigned char *seed);
-	void EXPORT ed25519_sign(unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key, const unsigned char *private_key);
-	int EXPORT ed25519_verify(const unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key);
-	void EXPORT ed25519_add_scalar(unsigned char *public_key, unsigned char *private_key, const unsigned char *scalar);
-	void EXPORT ed25519_key_exchange(unsigned char *shared_secret, const unsigned char *public_key, const unsigned char *private_key);
-}
-
 void EXPORT report_failure(char const* err, char const* file, int line);
 int EXPORT print_failures();
 

test/web_seed_suite.cpp

@@ -40,6 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/thread.hpp"
 #include "libtorrent/alert_types.hpp"
 
+#include "test.hpp"
 #include "setup_transfer.hpp"
 
 #include <boost/tuple/tuple.hpp>