From b478d59e9dc435565a7d47d58a8b915e3d80de63 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Tue, 15 Mar 2022 00:17:58 +0100 Subject: [PATCH] lib/warnless.[ch]: only check for WIN32 and ignore _WIN32 curl_setup.h automatically defines WIN32 if just _WIN32 is defined. Therefore make sure curl_setup.h is included through warnless.h. Reviewed-by: Daniel Stenberg Reviewed-by: Jay Satiro Closes #8594 --- lib/warnless.c | 4 ++-- lib/warnless.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/warnless.c b/lib/warnless.c index 15c8156d1c..9d21241271 100644 --- a/lib/warnless.c +++ b/lib/warnless.c @@ -360,7 +360,7 @@ curl_socket_t curlx_sitosk(int i) #endif /* USE_WINSOCK */ -#if defined(WIN32) || defined(_WIN32) +#if defined(WIN32) ssize_t curlx_read(int fd, void *buf, size_t count) { @@ -372,7 +372,7 @@ ssize_t curlx_write(int fd, const void *buf, size_t count) return (ssize_t)write(fd, buf, curlx_uztoui(count)); } -#endif /* WIN32 || _WIN32 */ +#endif /* WIN32 */ #if defined(__INTEL_COMPILER) && defined(__unix__) diff --git a/lib/warnless.h b/lib/warnless.h index 2c619bf819..aef2972544 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -22,6 +22,8 @@ * ***************************************************************************/ +#include "curl_setup.h" + #ifdef USE_WINSOCK #include /* for curl_socket_t */ #endif @@ -65,7 +67,7 @@ curl_socket_t curlx_sitosk(int i); #endif /* USE_WINSOCK */ -#if defined(WIN32) || defined(_WIN32) +#if defined(WIN32) ssize_t curlx_read(int fd, void *buf, size_t count); @@ -78,7 +80,7 @@ ssize_t curlx_write(int fd, const void *buf, size_t count); # define write(fd, buf, count) curlx_write(fd, buf, count) #endif -#endif /* WIN32 || _WIN32 */ +#endif /* WIN32 */ #if defined(__INTEL_COMPILER) && defined(__unix__) -- 2.47.3