Skip to content

Fix compilation failures with include <windows.h> #2057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2025
Merged

Fix compilation failures with include <windows.h> #2057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions httplib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ struct Request {
bool is_chunked_content_provider_ = false;
size_t authorization_count_ = 0;
std::chrono::time_point<std::chrono::steady_clock> start_time_ =
std::chrono::steady_clock::time_point::min();
(std::chrono::steady_clock::time_point::min)();
};

struct Response {
Expand Down Expand Up @@ -3359,7 +3359,7 @@ class SocketStream final : public Stream {
time_t write_timeout_sec, time_t write_timeout_usec,
time_t max_timeout_msec = 0,
std::chrono::time_point<std::chrono::steady_clock> start_time =
std::chrono::steady_clock::time_point::min());
(std::chrono::steady_clock::time_point::min)());
~SocketStream() override;

bool is_readable() const override;
Expand Down Expand Up @@ -3395,7 +3395,7 @@ class SSLSocketStream final : public Stream {
time_t read_timeout_usec, time_t write_timeout_sec,
time_t write_timeout_usec, time_t max_timeout_msec = 0,
std::chrono::time_point<std::chrono::steady_clock> start_time =
std::chrono::steady_clock::time_point::min());
(std::chrono::steady_clock::time_point::min)());
~SSLSocketStream() override;

bool is_readable() const override;
Expand Down Expand Up @@ -5994,7 +5994,7 @@ inline void calc_actual_timeout(time_t max_timeout_msec,
auto timeout_msec = (timeout_sec * 1000) + (timeout_usec / 1000);

auto actual_timeout_msec =
std::min(max_timeout_msec - duration_msec, timeout_msec);
(std::min)(max_timeout_msec - duration_msec, timeout_msec);

actual_timeout_sec = actual_timeout_msec / 1000;
actual_timeout_usec = (actual_timeout_msec % 1000) * 1000;
Expand Down