diff --git a/bindings/python/Jamfile b/bindings/python/Jamfile index 743c94d8d..0718b5ba0 100755 --- a/bindings/python/Jamfile +++ b/bindings/python/Jamfile @@ -47,10 +47,10 @@ rule libtorrent_linking ( properties * ) if source in $(properties) { - if static in $(properties) && linux - { - ECHO "WARNING: you cannot link statically against boost-python on linux, because it links against pthread statically in that case, which is not allowed" ; - } + if static in $(properties) && linux in $(properties) + { + ECHO "WARNING: you cannot link statically against boost-python on linux, because it links against pthread statically in that case, which is not allowed" ; + } # linux must link dynamically against boost python because it pulls # in libpthread, which must be linked dynamically since we're building a .so diff --git a/bindings/python/src/alert.cpp b/bindings/python/src/alert.cpp index fec0a0c96..7a074868e 100644 --- a/bindings/python/src/alert.cpp +++ b/bindings/python/src/alert.cpp @@ -182,6 +182,9 @@ void bind_alert() .value("ip_block_notification", alert::ip_block_notification) .value("performance_warning", alert::performance_warning) .value("stats_notification", alert::stats_notification) + .value("session_log_notification", alert::session_log_notification) + .value("torrent_log_notification", alert::torrent_log_notification) + .value("peer_log_notification", alert::peer_log_notification) // deliberately not INT_MAX. Arch linux crash while throwing an exception .value("all_categories", (alert::category_t)0xfffffff) ; diff --git a/include/libtorrent/alert.hpp b/include/libtorrent/alert.hpp index 70393a4e4..622b47d9e 100644 --- a/include/libtorrent/alert.hpp +++ b/include/libtorrent/alert.hpp @@ -166,10 +166,12 @@ namespace libtorrent { // the lasts stats alert. stats_notification = 0x800, +#ifndef TORRENT_NO_DEPRECATE // Alerts on RSS related events, like feeds being updated, feed error // conditions and successful RSS feed updates. Enabling this categoty // will make you receive rss_alert alerts. rss_notification = 0x1000, +#endif // Enables debug logging alerts. These are only available when // libtorrent is built with logging enabled (``TORRENT_LOGGING``).