mirror of
https://github.com/yhirose/cpp-httplib.git
synced 2026-10-20 11:29:38 +00:00
Keep time_point::max() clear of the Windows max macro
windows.h defines max() as a macro, which broke the Windows builds at the two time_point::max() calls the handshake deadline added. Wrap them in parentheses, as the other max() calls are.
This commit is contained in:
1 parent
2594f17983
commit
3b9931a85c
1 file changed
+2
-2
@@ -6692,7 +6692,7 @@ inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) {
|
|||||||
// comes, as a negative timeout waits forever in select_impl().
|
// comes, as a negative timeout waits forever in select_impl().
|
||||||
inline std::chrono::steady_clock::time_point deadline_after(time_t sec,
|
inline std::chrono::steady_clock::time_point deadline_after(time_t sec,
|
||||||
time_t usec) {
|
time_t usec) {
|
||||||
if (sec < 0) { return std::chrono::steady_clock::time_point::max(); }
|
if (sec < 0) { return (std::chrono::steady_clock::time_point::max)(); }
|
||||||
return std::chrono::steady_clock::now() + std::chrono::seconds(sec) +
|
return std::chrono::steady_clock::now() + std::chrono::seconds(sec) +
|
||||||
std::chrono::microseconds(usec);
|
std::chrono::microseconds(usec);
|
||||||
}
|
}
|
||||||
@@ -6701,7 +6701,7 @@ inline std::chrono::steady_clock::time_point deadline_after(time_t sec,
|
|||||||
// TLS handshake come out of a single timeout.
|
// TLS handshake come out of a single timeout.
|
||||||
inline ssize_t select_until(socket_t sock, short events,
|
inline ssize_t select_until(socket_t sock, short events,
|
||||||
std::chrono::steady_clock::time_point deadline) {
|
std::chrono::steady_clock::time_point deadline) {
|
||||||
if (deadline == std::chrono::steady_clock::time_point::max()) {
|
if (deadline == (std::chrono::steady_clock::time_point::max)()) {
|
||||||
return select_impl(sock, events, -1, 0);
|
return select_impl(sock, events, -1, 0);
|
||||||
}
|
}
|
||||||
auto left = std::chrono::duration_cast<std::chrono::microseconds>(
|
auto left = std::chrono::duration_cast<std::chrono::microseconds>(
|
||||||
|
|||||||
Reference in new issue
Block a user