cross compiling fixes

This commit is contained in:
Arvid Norberg 2011-02-14 04:12:26 +00:00
parent 5864a883e6
commit 7508038337
5 changed files with 6 additions and 6 deletions

View File

@ -56,7 +56,7 @@ rule linking ( properties * )
if <target-os>linux in $(properties)
{
# linker library on linux, required when using openssl
# result += <library>dl ;
result += <library>dl ;
}
}
@ -356,7 +356,7 @@ lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
lib z : : <link>shared <name>z <search>/lib ;
lib crypto : : <name>crypto <search>/lib <use>z ;
lib ssl : : <name>ssl <link>shared <use>crypto ;
lib dl : : <link>shared <name>/libdl.so <search>/lib ;
lib dl : : <link>shared <name>dl ;
# time functions used on linux require librt
lib librt : : <name>rt <link>shared ;

View File

@ -204,7 +204,7 @@ namespace libtorrent
void on_have_none(int received);
void on_reject_request(int received);
void on_allowed_fast(int received);
#ifndef TORRENT_DISABLE_ENCRYPTION
#ifndef TORRENT_DISABLE_EXTENSIONS
void on_holepunch();
#endif

View File

@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/assert.hpp"
#ifdef TORRENT_WINDOWS
#include <Windows.h>
#include <windows.h>
#elif defined TORRENT_BEOS
#include <kernel/OS.h>
#include <stdlib.h> // malloc/free

View File

@ -107,7 +107,7 @@ namespace libtorrent { namespace
int sockaddr_len(sockaddr const* sin)
{
#if defined TORRENT_WINDOWS || TORRENT_MINGW || defined TORRENT_LINUX
#if defined TORRENT_WINDOWS || defined TORRENT_MINGW || defined TORRENT_LINUX
return sin->sa_family == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
#else
return sin->sa_len;

View File

@ -98,7 +98,7 @@ static int my_fallocate(int fd, int mode, loff_t offset, loff_t len)
#endif
}
#elif defined __APPLE__ && defined __MACH__
#elif defined __APPLE__ && defined __MACH__ && MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
// mac specifics
#include <copyfile.h>