From 720076acb56c1f99aa61998695b22153c510728e Mon Sep 17 00:00:00 2001 From: zsilencer Date: Wed, 19 Aug 2015 22:59:55 -0600 Subject: [PATCH] fix cmake error --- 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 5642318301..dd5797c34c 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -538,7 +538,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 = min(chunksize, size - i); + int datasize = (std::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);