fix build with i2p disabled

This commit is contained in:
Arvid Norberg 2012-07-31 16:53:37 +00:00
parent e51a30f3dd
commit ee3b006c85
2 changed files with 7 additions and 0 deletions

View File

@ -306,6 +306,10 @@ feature need-librt : no yes : composite propagated link-incompatible ;
feature fiemap : off on : composite propagated ; feature fiemap : off on : composite propagated ;
feature.compose <fiemap>on : <define>HAVE_LINUX_FIEMAP_H ; feature.compose <fiemap>on : <define>HAVE_LINUX_FIEMAP_H ;
feature i2p : on off : composite propagated ;
feature.compose <i2p>on : <define>TORRENT_USE_I2P=1 ;
feature.compose <i2p>off : <define>TORRENT_USE_I2P=0 ;
feature iconv : auto on off : composite propagated ; feature iconv : auto on off : composite propagated ;
feature.compose <iconv>on : <define>TORRENT_USE_ICONV=1 ; feature.compose <iconv>on : <define>TORRENT_USE_ICONV=1 ;
feature.compose <iconv>off : <define>TORRENT_USE_ICONV=0 ; feature.compose <iconv>off : <define>TORRENT_USE_ICONV=0 ;

View File

@ -1766,9 +1766,12 @@ namespace aux {
if (m_socks_listen_socket && m_socks_listen_socket->is_open()) if (m_socks_listen_socket && m_socks_listen_socket->is_open())
m_socks_listen_socket->close(); m_socks_listen_socket->close();
m_socks_listen_socket.reset(); m_socks_listen_socket.reset();
#if TORRENT_USE_I2P
if (m_i2p_listen_socket && m_i2p_listen_socket->is_open()) if (m_i2p_listen_socket && m_i2p_listen_socket->is_open())
m_i2p_listen_socket->close(); m_i2p_listen_socket->close();
m_i2p_listen_socket.reset(); m_i2p_listen_socket.reset();
#endif
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING) #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " aborting all torrents (" << m_torrents.size() << ")\n"; (*m_logger) << time_now_string() << " aborting all torrents (" << m_torrents.size() << ")\n";