diff options
| author | Max Kellermann <max@musicpd.org> | 2017-12-12 10:22:20 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2017-12-12 10:22:20 +0100 |
| commit | dfaf08743cade4c10c464bfbbb15d8f96c6e5cd9 (patch) | |
| tree | 09be190640403b134b8967e1daf0d72445b146ed /src/net | |
| parent | d9552d8a6d2fbc916e5a7bf6e75c2d3b4f29c38e (diff) | |
*: check defined(_WIN32) instead of defined(WIN32)
Only _WIN32 is defined by the compiler, and WIN32 is not standardized
and may be missing.
Closes #169
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/Resolver.cxx | 2 | ||||
| -rw-r--r-- | src/net/SocketAddress.hxx | 4 | ||||
| -rw-r--r-- | src/net/SocketError.cxx | 2 | ||||
| -rw-r--r-- | src/net/SocketError.hxx | 14 | ||||
| -rw-r--r-- | src/net/ToString.cxx | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/net/Resolver.cxx b/src/net/Resolver.cxx index 036f95fb2..160447e03 100644 --- a/src/net/Resolver.cxx +++ b/src/net/Resolver.cxx @@ -23,7 +23,7 @@ #include <string> -#ifdef WIN32 +#ifdef _WIN32 #include <ws2tcpip.h> #else #include <sys/types.h> diff --git a/src/net/SocketAddress.hxx b/src/net/SocketAddress.hxx index 5db6d55f9..6b82602f3 100644 --- a/src/net/SocketAddress.hxx +++ b/src/net/SocketAddress.hxx @@ -34,7 +34,7 @@ #include <cstddef> -#ifdef WIN32 +#ifdef _WIN32 #include <winsock2.h> #else #include <sys/socket.h> @@ -45,7 +45,7 @@ */ class SocketAddress { public: -#ifdef WIN32 +#ifdef _WIN32 typedef int size_type; #else typedef socklen_t size_type; diff --git a/src/net/SocketError.cxx b/src/net/SocketError.cxx index 082dec187..9beef4fc9 100644 --- a/src/net/SocketError.cxx +++ b/src/net/SocketError.cxx @@ -23,7 +23,7 @@ #include <string.h> -#ifdef WIN32 +#ifdef _WIN32 SocketErrorMessage::SocketErrorMessage(socket_error_t code) noexcept { diff --git a/src/net/SocketError.hxx b/src/net/SocketError.hxx index 6e3a7799c..c4caac646 100644 --- a/src/net/SocketError.hxx +++ b/src/net/SocketError.hxx @@ -23,7 +23,7 @@ #include "Compiler.h" #include "system/Error.hxx" -#ifdef WIN32 +#ifdef _WIN32 #include <winsock2.h> typedef DWORD socket_error_t; #else @@ -35,7 +35,7 @@ gcc_pure static inline socket_error_t GetSocketError() noexcept { -#ifdef WIN32 +#ifdef _WIN32 return WSAGetLastError(); #else return errno; @@ -46,7 +46,7 @@ gcc_const static inline bool IsSocketErrorAgain(socket_error_t code) noexcept { -#ifdef WIN32 +#ifdef _WIN32 return code == WSAEINPROGRESS; #else return code == EAGAIN; @@ -57,7 +57,7 @@ gcc_const static inline bool IsSocketErrorInterruped(socket_error_t code) noexcept { -#ifdef WIN32 +#ifdef _WIN32 return code == WSAEINTR; #else return code == EINTR; @@ -68,7 +68,7 @@ gcc_const static inline bool IsSocketErrorClosed(socket_error_t code) noexcept { -#ifdef WIN32 +#ifdef _WIN32 return code == WSAECONNRESET; #else return code == EPIPE || code == ECONNRESET; @@ -81,7 +81,7 @@ IsSocketErrorClosed(socket_error_t code) noexcept * and this class hosts the buffer. */ class SocketErrorMessage { -#ifdef WIN32 +#ifdef _WIN32 char msg[256]; #else const char *const msg; @@ -99,7 +99,7 @@ gcc_const static inline std::system_error MakeSocketError(socket_error_t code, const char *msg) noexcept { -#ifdef WIN32 +#ifdef _WIN32 return MakeLastError(code, msg); #else return MakeErrno(code, msg); diff --git a/src/net/ToString.cxx b/src/net/ToString.cxx index f185a5e2e..3492a269b 100644 --- a/src/net/ToString.cxx +++ b/src/net/ToString.cxx @@ -34,7 +34,7 @@ #include <algorithm> -#ifdef WIN32 +#ifdef _WIN32 #include <ws2tcpip.h> #else #include <netdb.h> |