diff --git a/r5dev/thirdparty/zip/src/compression/compression_interface.h b/r5dev/thirdparty/zip/src/compression/compression_interface.h index 22cf3d56..e026830b 100644 --- a/r5dev/thirdparty/zip/src/compression/compression_interface.h +++ b/r5dev/thirdparty/zip/src/compression/compression_interface.h @@ -13,7 +13,7 @@ struct compression_encoder_properties_interface template inline T clamp(T minimum, T maximum, T value) { - return std::min(std::max(minimum, value), maximum); + return (std::min)((std::max)(minimum, value), maximum); } }; diff --git a/r5dev/thirdparty/zip/src/streams/streambuffs/sub_streambuf.h b/r5dev/thirdparty/zip/src/streams/streambuffs/sub_streambuf.h index 4ec48450..5265e415 100644 --- a/r5dev/thirdparty/zip/src/streams/streambuffs/sub_streambuf.h +++ b/r5dev/thirdparty/zip/src/streams/streambuffs/sub_streambuf.h @@ -66,7 +66,7 @@ class sub_streambuf : ELEM_TYPE* base = _internalBuffer; _inputStream->seekg(_currentPosition, std::ios::beg); - _inputStream->read(_internalBuffer, std::min(static_cast(INTERNAL_BUFFER_SIZE), static_cast(_endPosition - _currentPosition))); + _inputStream->read(_internalBuffer, (std::min)(static_cast(INTERNAL_BUFFER_SIZE), static_cast(_endPosition - _currentPosition))); size_t n = static_cast(_inputStream->gcount()); _currentPosition += n;