Skip to content
This repository was archived by the owner on Apr 30, 2025. It is now read-only.

Commit 3da42fd

Browse files
authored
Avoid min/max macro expansion on Windows (yhirose#1057)
1 parent 503aa61 commit 3da42fd

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

httplib.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -2900,10 +2900,10 @@ inline bool gzip_compressor::compress(const char *data, size_t data_length,
29002900

29012901
do {
29022902
constexpr size_t max_avail_in =
2903-
std::numeric_limits<decltype(strm_.avail_in)>::max();
2903+
(std::numeric_limits<decltype(strm_.avail_in)>::max)();
29042904

29052905
strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
2906-
std::min(data_length, max_avail_in));
2906+
(std::min)(data_length, max_avail_in));
29072907
strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
29082908

29092909
data_length -= strm_.avail_in;
@@ -2959,10 +2959,10 @@ inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
29592959

29602960
do {
29612961
constexpr size_t max_avail_in =
2962-
std::numeric_limits<decltype(strm_.avail_in)>::max();
2962+
(std::numeric_limits<decltype(strm_.avail_in)>::max)();
29632963

29642964
strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
2965-
std::min(data_length, max_avail_in));
2965+
(std::min)(data_length, max_avail_in));
29662966
strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
29672967

29682968
data_length -= strm_.avail_in;
@@ -4430,9 +4430,9 @@ inline bool SocketStream::is_writable() const {
44304430

44314431
inline ssize_t SocketStream::read(char *ptr, size_t size) {
44324432
#ifdef _WIN32
4433-
size = std::min(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
4433+
size = (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
44344434
#else
4435-
size = std::min(size, static_cast<size_t>((std::numeric_limits<ssize_t>::max)()));
4435+
size = (std::min)(size, static_cast<size_t>((std::numeric_limits<ssize_t>::max)()));
44364436
#endif
44374437

44384438
if (read_buff_off_ < read_buff_content_size_) {
@@ -4475,7 +4475,7 @@ inline ssize_t SocketStream::write(const char *ptr, size_t size) {
44754475
if (!is_writable()) { return -1; }
44764476

44774477
#ifdef _WIN32
4478-
size = std::min(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
4478+
size = (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
44794479
#endif
44804480

44814481
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,
50035003
/* For debug
50045004
size_t pos = 0;
50055005
while (pos < n) {
5006-
auto read_size = std::min<size_t>(1, n - pos);
5006+
auto read_size = (std::min)<size_t>(1, n - pos);
50075007
auto ret = multipart_form_data_parser.parse(
50085008
buf + pos, read_size, multipart_receiver, mulitpart_header);
50095009
if (!ret) { return false; }

0 commit comments

Comments
 (0)