merge build fix from RC_0_16

2014-06-19 03:34:42 +00:00 · 2014-06-19 03:34:42 +00:00 · 8d44d87556
parent 46e9d1048a
commit 8d44d87556
1 changed files with 1 additions and 1 deletions
--- a/src/utp_stream.cpp
+++ b/src/utp_stream.cpp
@ -1855,7 +1855,7 @@ bool utp_socket_impl::send_pkt(int flags)

 	h->timestamp_difference_microseconds = m_reply_micro;
 	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;

 	// if this is a FIN packet, override the type