premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

some solaris build fixes

This commit is contained in:
Arvid Norberg 2010-11-28 00:26:33 +00:00
parent f21251cba8
commit af6ac4aca9
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jamfile
View File

@ -333,7 +333,7 @@ lib boost_system : : <name>boost_system ;
# openssl on linux/bsd/macos etc. # openssl on linux/bsd/macos etc.
lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ; lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
lib crypto : : <name>crypto <link>shared ; lib crypto : : <name>crypto <search>/lib ;
lib ssl : : <name>ssl <link>shared <use>crypto ; lib ssl : : <name>ssl <link>shared <use>crypto ;
# time functions used on linux require librt # time functions used on linux require librt

3
include/libtorrent/session.hpp
View File

@ -160,9 +160,10 @@ namespace libtorrent
save_proxy = 0x008, save_proxy = 0x008,
save_i2p_proxy = 0x010, save_i2p_proxy = 0x010,
save_encryption_settings = 0x020, save_encryption_settings = 0x020,
save_as_map = 0x040, save_as_map = 0x040
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
,
save_dht_proxy = save_proxy, save_dht_proxy = save_proxy,
save_peer_proxy = save_proxy, save_peer_proxy = save_proxy,
save_web_proxy = save_proxy, save_web_proxy = save_proxy,

8
test/test_threads.cpp
View File

@ -37,10 +37,10 @@ POSSIBILITY OF SUCH DAMAGE.
using namespace libtorrent; using namespace libtorrent;
void fun(condition* s, mutex* m, int i) void fun(condition* s, libtorrent::mutex* m, int i)
{ {
fprintf(stderr, "thread %d waiting\n", i); fprintf(stderr, "thread %d waiting\n", i);
mutex::scoped_lock l(*m); libtorrent::mutex::scoped_lock l(*m);
s->wait(l); s->wait(l);
fprintf(stderr, "thread %d done\n", i); fprintf(stderr, "thread %d done\n", i);
} }
@ -48,7 +48,7 @@ void fun(condition* s, mutex* m, int i)
int test_main() int test_main()
{ {
condition cond; condition cond;
mutex m; libtorrent::mutex m;
std::list<thread*> threads; std::list<thread*> threads;
for (int i = 0; i < 20; ++i) for (int i = 0; i < 20; ++i)
{ {
@ -58,7 +58,7 @@ int test_main()
// make sure all threads are waiting on the condition // make sure all threads are waiting on the condition
sleep(10); sleep(10);
mutex::scoped_lock l(m); libtorrent::mutex::scoped_lock l(m);
cond.signal_all(l); cond.signal_all(l);
l.unlock(); l.unlock();