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

fix build with verbose logging and missing INT64_MAX on msvc

This commit is contained in:
Arvid Norberg 2012-06-23 05:46:51 +00:00
parent d73bbf5053
commit 7351f68b98
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/config.hpp
View File

@ -67,6 +67,10 @@ POSSIBILITY OF SUCH DAMAGE.
#endif
#endif
#ifndef INT64_MAX
#define INT64_MAX 0x7fffffffffffffffLL
#endif
// backwards compatibility with older versions of boost
#if !defined BOOST_SYMBOL_EXPORT && !defined BOOST_SYMBOL_IMPORT
# if defined _MSC_VER || defined __MINGW32__

2
include/libtorrent/upnp.hpp
View File

@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/deadline_timer.hpp"
#include <boost/function/function1.hpp>
#include <boost/function/function3.hpp>
#include <boost/function/function4.hpp>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
#include <set>

10
src/session_impl.cpp
View File

@ -918,17 +918,10 @@ namespace aux {
#endif
PRINT_SIZEOF(udp_socket)
PRINT_OFFSETOF(udp_socket, m_callback)
PRINT_OFFSETOF(udp_socket, m_callback2)
PRINT_OFFSETOF(udp_socket, m_ipv4_sock)
PRINT_OFFSETOF(udp_socket, m_v4_ep)
PRINT_OFFSETOF(udp_socket, m_v4_buf)
PRINT_OFFSETOF(udp_socket, m_reallocate_buffer4)
PRINT_OFFSETOF(udp_socket, m_buf)
#if TORRENT_USE_IPV6
PRINT_OFFSETOF(udp_socket, m_ipv6_sock)
PRINT_OFFSETOF(udp_socket, m_v6_ep)
PRINT_OFFSETOF(udp_socket, m_v6_buf)
PRINT_OFFSETOF(udp_socket, m_reallocate_buffer6)
#endif
PRINT_OFFSETOF(udp_socket, m_bind_port)
PRINT_OFFSETOF(udp_socket, m_v4_outstanding)
@ -2462,6 +2455,7 @@ namespace aux {
&& m_alerts.should_post<udp_error_alert>())
m_alerts.post_alert(udp_error_alert(ep, ec));
}
return false;
}
void session_impl::async_accept(boost::shared_ptr<socket_acceptor> const& listener, bool ssl)