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

Merge pull request #970 from aldenml/bjam-windows-version-default-1.2 

don't define _WIN32_WINNT if not under windows
This commit is contained in:
Arvid Norberg 2016-07-30 21:27:14 -04:00 committed by GitHub
parent 0126f6f2c6 f795e88789
commit e368efe535
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jamfile
View File

@ -133,10 +133,10 @@ rule linking ( properties * )
result += <library>gcrypt ; result += <library>gcrypt ;
} }
# socket functions on windows require winsock libraries
if <target-os>windows in $(properties) if <target-os>windows in $(properties)
|| <target-os>cygwin in $(properties) || <target-os>cygwin in $(properties)
{ {
# socket functions on windows require winsock libraries
result += <library>ws2_32 result += <library>ws2_32
<library>wsock32 <library>wsock32
<library>iphlpapi <library>iphlpapi
@ -152,6 +152,12 @@ rule linking ( properties * )
{ {
result += <library>advapi32 ; result += <library>advapi32 ;
} }
# default to windows vista
if <windows-version>default in $(properties)
{
result += <define>_WIN32_WINNT=0x0600 ;
}
} }
if <target-os>beos in $(properties) if <target-os>beos in $(properties)
@ -412,7 +418,7 @@ feature.compose <asserts>on : <define>TORRENT_USE_ASSERTS=1 ;
feature.compose <asserts>production : <define>TORRENT_USE_ASSERTS=1 <define>TORRENT_PRODUCTION_ASSERTS=1 ; feature.compose <asserts>production : <define>TORRENT_USE_ASSERTS=1 <define>TORRENT_PRODUCTION_ASSERTS=1 ;
feature.compose <asserts>system : <define>TORRENT_USE_ASSERTS=1 <define>TORRENT_USE_SYSTEM_ASSERTS=1 ; feature.compose <asserts>system : <define>TORRENT_USE_ASSERTS=1 <define>TORRENT_USE_SYSTEM_ASSERTS=1 ;
feature windows-version : vista win7 xp : composite propagated link-incompatible ; feature windows-version : default vista win7 xp : composite propagated link-incompatible ;
feature.compose <windows-version>vista : <define>_WIN32_WINNT=0x0600 ; feature.compose <windows-version>vista : <define>_WIN32_WINNT=0x0600 ;
feature.compose <windows-version>win7 : <define>_WIN32_WINNT=0x0601 ; feature.compose <windows-version>win7 : <define>_WIN32_WINNT=0x0601 ;
feature.compose <windows-version>xp : <define>_WIN32_WINNT=0x0501 ; feature.compose <windows-version>xp : <define>_WIN32_WINNT=0x0501 ;

3
test/setup_transfer.cpp
View File

@ -31,7 +31,6 @@ POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <fstream> #include <fstream>
#include <deque>
#include <map> #include <map>
#include <tuple> #include <tuple>
#include <functional> #include <functional>
@ -45,7 +44,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/create_torrent.hpp" #include "libtorrent/create_torrent.hpp"
#include "libtorrent/socket_io.hpp" // print_endpoint #include "libtorrent/socket_io.hpp" // print_endpoint
#include "libtorrent/socket_type.hpp" #include "libtorrent/socket_type.hpp"
#include "libtorrent/instantiate_connection.hpp"
#include "libtorrent/ip_filter.hpp" #include "libtorrent/ip_filter.hpp"
#include "libtorrent/session_stats.hpp" #include "libtorrent/session_stats.hpp"
#include "libtorrent/random.hpp" #include "libtorrent/random.hpp"
@ -1030,4 +1028,3 @@ libtorrent::address_v6 addr6(char const* ip)
return ret; return ret;
} }
#endif #endif

1
test/setup_transfer.hpp
View File

@ -119,4 +119,3 @@ EXPORT libtorrent::address_v6 addr6(char const* ip);
#endif #endif
#endif #endif

3
test/web_seed_suite.cpp
View File

@ -210,7 +210,7 @@ void test_transfer(lt::session& ses, boost::shared_ptr<torrent_info> torrent_fil
} }
else else
{ {
// if the web seed senr corrupt data and we banned it, we probably didn't // if the web seed sent corrupt data and we banned it, we probably didn't
// end up using all the cache anyway // end up using all the cache anyway
torrent_status st = th.status(); torrent_status st = th.status();
TEST_EQUAL(st.is_seeding, true); TEST_EQUAL(st.is_seeding, true);
@ -423,4 +423,3 @@ int EXPORT run_http_suite(int proxy, char const* protocol, bool test_url_seed
stop_web_server(); stop_web_server();
return 0; return 0;
} }

1
test/web_seed_suite.hpp
View File

@ -41,4 +41,3 @@ void EXPORT test_transfer(libtorrent::session& ses
, int proxy = 0, char const* protocol = "http" , int proxy = 0, char const* protocol = "http"
, bool url_seed = true, bool chunked_encoding = false , bool url_seed = true, bool chunked_encoding = false
, bool test_ban = false, bool keepalive = true, bool proxy_peers = true); , bool test_ban = false, bool keepalive = true, bool proxy_peers = true);