From 3da42fd1e8f4d5fbe64430845c6fe13a3838187a Mon Sep 17 00:00:00 2001 From: estshorter <1430311+estshorter@users.noreply.github.com> Date: Sat, 25 Sep 2021 21:53:15 +0900 Subject: [PATCH] Avoid min/max macro expansion on Windows (#1057) --- httplib.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/httplib.h b/httplib.h index c57fa31..85cb75b 100644 --- a/httplib.h +++ b/httplib.h @@ -2900,10 +2900,10 @@ inline bool gzip_compressor::compress(const char *data, size_t data_length, do { constexpr size_t max_avail_in = - std::numeric_limits::max(); + (std::numeric_limits::max)(); strm_.avail_in = static_cast( - std::min(data_length, max_avail_in)); + (std::min)(data_length, max_avail_in)); strm_.next_in = const_cast(reinterpret_cast(data)); data_length -= strm_.avail_in; @@ -2959,10 +2959,10 @@ inline bool gzip_decompressor::decompress(const char *data, size_t data_length, do { constexpr size_t max_avail_in = - std::numeric_limits::max(); + (std::numeric_limits::max)(); strm_.avail_in = static_cast( - std::min(data_length, max_avail_in)); + (std::min)(data_length, max_avail_in)); strm_.next_in = const_cast(reinterpret_cast(data)); data_length -= strm_.avail_in; @@ -4430,9 +4430,9 @@ inline bool SocketStream::is_writable() const { inline ssize_t SocketStream::read(char *ptr, size_t size) { #ifdef _WIN32 - size = std::min(size, static_cast((std::numeric_limits::max)())); + size = (std::min)(size, static_cast((std::numeric_limits::max)())); #else - size = std::min(size, static_cast((std::numeric_limits::max)())); + size = (std::min)(size, static_cast((std::numeric_limits::max)())); #endif if (read_buff_off_ < read_buff_content_size_) { @@ -4475,7 +4475,7 @@ inline ssize_t SocketStream::write(const char *ptr, size_t size) { if (!is_writable()) { return -1; } #ifdef _WIN32 - size = std::min(size, static_cast((std::numeric_limits::max)())); + size = (std::min)(size, static_cast((std::numeric_limits::max)())); #endif return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS); @@ -5003,7 +5003,7 @@ inline bool Server::read_content_core(Stream &strm, Request &req, Response &res, /* For debug size_t pos = 0; while (pos < n) { - auto read_size = std::min(1, n - pos); + auto read_size = (std::min)(1, n - pos); auto ret = multipart_form_data_parser.parse( buf + pos, read_size, multipart_receiver, mulitpart_header); if (!ret) { return false; }