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

fix Jamfile typo for extensions=on as well as mistakes in ifdefs for encryption fields/code

This commit is contained in:
Arvid Norberg 2013-12-20 06:38:51 +00:00
parent 98d4fa3da7
commit d58066b32d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jamfile
View File

@ -347,7 +347,7 @@ feature.compose <windows-version>vista : <define>_WIN32_WINNT=0x0600 ;
feature.compose <windows-version>win7 : <define>_WIN32_WINNT=0x0601 ; feature.compose <windows-version>win7 : <define>_WIN32_WINNT=0x0601 ;
feature extensions : on off : composite propagated link-incompatible ; feature extensions : on off : composite propagated link-incompatible ;
feature.compose <extensions>off : <define>TORRENT_DISABLE_EXTENSION ; feature.compose <extensions>off : <define>TORRENT_DISABLE_EXTENSIONS ;
feature asio-debugging : off on : composite propagated link-incompatible ; feature asio-debugging : off on : composite propagated link-incompatible ;
feature.compose <asio-debugging>on : <define>TORRENT_ASIO_DEBUGGING ; feature.compose <asio-debugging>on : <define>TORRENT_ASIO_DEBUGGING ;

7
include/libtorrent/bt_peer_connection.hpp
View File

@ -372,7 +372,9 @@ private:
// true if rc4, false if plaintext // true if rc4, false if plaintext
bool m_rc4_encrypted:1; bool m_rc4_encrypted:1;
#endif
#ifndef TORRENT_DISABLE_EXTENSIONS
// the message ID for upload only message // the message ID for upload only message
// 0 if not supported // 0 if not supported
boost::uint8_t m_upload_only_id; boost::uint8_t m_upload_only_id;
@ -434,7 +436,9 @@ private:
// used to disconnect peer if sync points are not found within // used to disconnect peer if sync points are not found within
// the maximum number of bytes // the maximum number of bytes
int m_sync_bytes_read; int m_sync_bytes_read;
#endif // #ifndef TORRENT_DISABLE_ENCRYPTION
#ifndef TORRENT_DISABLE_EXTENSIONS
// the message ID for don't-have message // the message ID for don't-have message
boost::uint8_t m_dont_have_id; boost::uint8_t m_dont_have_id;
@ -445,8 +449,7 @@ private:
// the reserved bits received from the other peer // the reserved bits received from the other peer
// in the bittorrent handshake // in the bittorrent handshake
char m_reserved_bits[8]; char m_reserved_bits[8];
#endif // #ifndef TORRENT_DISABLE_ENCRYPTION #endif
}; };
} }