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

fixed windows build

This commit is contained in:
Arvid Norberg 2009-02-06 17:59:49 +00:00
parent 5c12db28d2
commit 7ddffbac64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/disk_io_thread.cpp
View File

@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/time.hpp" #include "libtorrent/time.hpp"
#endif #endif
#ifndef TORRENT_DISABLE_MLOCK #if !defined TORRENT_DISABLE_MLOCK && !defined TORRENT_WINDOWS
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
@ -819,7 +819,7 @@ namespace libtorrent
for (int i = 0; i < blocks_in_piece; ++i) for (int i = 0; i < blocks_in_piece; ++i)
{ {
TORRENT_ASSERT(p->blocks[i]); TORRENT_ASSERT(p->blocks[i]);
ctx.update((char const*)p->blocks[i], std::min(piece_size, m_block_size)); ctx.update((char const*)p->blocks[i], (std::min)(piece_size, m_block_size));
piece_size -= m_block_size; piece_size -= m_block_size;
} }
h = ctx.final(); h = ctx.final();