fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-18 15:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into xirvik

Browse Source
This commit is contained in:
rakshasa
2012-03-21 00:09:58 +09:00
parent 89611a222c f1cd0f4780
commit 0514a5c0d1
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+2
View File
@@ -1,5 +1,7 @@
AC_INIT(rtorrent, 0.9.1, jaris@ifi.uio.no) AC_INIT(rtorrent, 0.9.1, jaris@ifi.uio.no)
AC_DEFINE(API_VERSION, 1, api version)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_PATH_CPPUNIT(1.9.6) AM_PATH_CPPUNIT(1.9.6)
src/command_local.cc
+1
View File
@@ -328,6 +328,7 @@ initialize_command_local() {
CMD2_ANY ("system.hostname", std::bind(&system_hostname)); CMD2_ANY ("system.hostname", std::bind(&system_hostname));
CMD2_ANY ("system.pid", std::bind(&getpid)); CMD2_ANY ("system.pid", std::bind(&getpid));
CMD2_VAR_C_STRING("system.api_version", (int64_t)API_VERSION);
CMD2_VAR_C_STRING("system.client_version", PACKAGE_VERSION); CMD2_VAR_C_STRING("system.client_version", PACKAGE_VERSION);
CMD2_VAR_C_STRING("system.library_version", torrent::version()); CMD2_VAR_C_STRING("system.library_version", torrent::version());
CMD2_VAR_VALUE ("system.file.allocate", 0); CMD2_VAR_VALUE ("system.file.allocate", 0);
src/main.cc
+3 -3
View File
@@ -188,9 +188,6 @@ main(int argc, char** argv) {
control = new Control; control = new Control;
worker_thread = new ThreadWorker();
worker_thread->init_thread();
srandom(cachedTime.usec()); srandom(cachedTime.usec());
srand48(cachedTime.usec()); srand48(cachedTime.usec());
@@ -217,6 +214,9 @@ main(int argc, char** argv) {
torrent::main_thread()->slot_do_work() = tr1::bind(&client_perform); torrent::main_thread()->slot_do_work() = tr1::bind(&client_perform);
torrent::main_thread()->slot_next_timeout() = tr1::bind(&client_next_timeout, control); torrent::main_thread()->slot_next_timeout() = tr1::bind(&client_next_timeout, control);
worker_thread = new ThreadWorker();
worker_thread->init_thread();
// Initialize option handlers after libtorrent to ensure // Initialize option handlers after libtorrent to ensure
// torrent::ConnectionManager* are valid etc. // torrent::ConnectionManager* are valid etc.
initialize_commands(); initialize_commands();