merge build fix from RC_0_16
This commit is contained in:
parent
46e9d1048a
commit
8d44d87556
|
@ -1855,7 +1855,7 @@ bool utp_socket_impl::send_pkt(int flags)
|
||||||
|
|
||||||
h->timestamp_difference_microseconds = m_reply_micro;
|
h->timestamp_difference_microseconds = m_reply_micro;
|
||||||
h->wnd_size = (std::max)(m_in_buf_size - m_buffered_incoming_bytes
|
h->wnd_size = (std::max)(m_in_buf_size - m_buffered_incoming_bytes
|
||||||
- m_receive_buffer_size, 0);
|
- m_receive_buffer_size, boost::int32_t(0));
|
||||||
h->ack_nr = m_ack_nr;
|
h->ack_nr = m_ack_nr;
|
||||||
|
|
||||||
// if this is a FIN packet, override the type
|
// if this is a FIN packet, override the type
|
||||||
|
|
Loading…
Reference in New Issue