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

Merge remote-tracking branch 'origin/master' into xirvik

Browse Source
This commit is contained in:
rakshasa
2014-05-09 18:05:56 +09:00
parent ce5d67a9c0 e42ec54920
commit 4f36c3e49f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+2 -2
View File
@@ -1,4 +1,4 @@
AC_INIT(rtorrent, 0.9.3, sundell.software@gmail.com) AC_INIT(rtorrent, 0.9.4, sundell.software@gmail.com)
AC_DEFINE(API_VERSION, 8, api version) AC_DEFINE(API_VERSION, 8, api version)
@@ -45,7 +45,7 @@ PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
LIBS="$LIBS $libcurl_LIBS") LIBS="$LIBS $libcurl_LIBS")
PKG_CHECK_MODULES([libtorrent], libtorrent >= 0.13.3, PKG_CHECK_MODULES([libtorrent], libtorrent >= 0.13.4,
CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS"; CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS";
LIBS="$LIBS $libtorrent_LIBS") LIBS="$LIBS $libtorrent_LIBS")
src/rpc/scgi.h
+1 -1
View File
@@ -53,7 +53,7 @@ class lt_cacheline_aligned SCgi : public torrent::Event {
public: public:
typedef rak::function2<bool, const char*, uint32_t> slot_write; typedef rak::function2<bool, const char*, uint32_t> slot_write;
static const int max_tasks = 30; static const int max_tasks = 100;
// Global lock: // Global lock:
SCgi() : m_logFd(-1) {} SCgi() : m_logFd(-1) {}