wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-09-01 08:59:12 +00:00
parent 57b00ae42e
commit 19f3de10dd
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/http_parser.hpp
View File

@ -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

13
test/test.hpp
View File

@ -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();

1
test/web_seed_suite.cpp
View File

@ -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>