Skip to content

Move poll define/undef into c++ file. to fix https://github.com/yhirose/cpp-httplib/issues/2106 #2108

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

Closed
wants to merge 1 commit into from
Closed

Move poll define/undef into c++ file. to fix https://github.com/yhirose/cpp-httplib/issues/2106 #2108

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
13 changes: 7 additions & 6 deletions httplib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ using ssize_t = long;

using socket_t = SOCKET;
using socklen_t = int;
#define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)

#else // not _WIN32

Expand Down Expand Up @@ -2660,7 +2659,9 @@ inline bool is_field_value(const std::string &s) { return is_field_content(s); }
/*
* Implementation that will be part of the .cc file if split into .h + .cc.
*/

#if defined(_WIN32)
#define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)
#endif
namespace detail {

inline bool is_hex(char c, int &v) {
Expand Down Expand Up @@ -10372,13 +10373,13 @@ inline SSL_CTX *Client::ssl_context() const {
return nullptr;
}
#endif

#ifdef _WIN32
#undef poll
#endif
// ----------------------------------------------------------------------------

} // namespace httplib

#ifdef _WIN32
#undef poll
#endif


#endif // CPPHTTPLIB_HTTPLIB_H