From 408628c80caa17159291e359c0bbdf7928752a2b Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Wed, 19 Aug 2015 07:47:21 +0100 Subject: [PATCH] fix building on VS --- src/network/network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/network.cpp b/src/network/network.cpp index f72cf1478f..2f9ab7a07d 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -570,7 +570,7 @@ void Network::Server_Send_MAP(NetworkConnection* connection) int size = (int)SDL_RWtell(rw); int chunksize = 1000; for (int i = 0; i < size; i += chunksize) { - int datasize = std::min(chunksize, size - i); + int datasize = min(chunksize, size - i); std::unique_ptr packet = std::move(NetworkPacket::Allocate()); *packet << (uint32)NETWORK_COMMAND_MAP << (uint32)size << (uint32)i; packet->Write(&buffer[i], datasize);