luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/warnless.[ch]: only check for WIN32 and ignore _WIN32

Browse Source 
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
This commit is contained in:
Marc Hoersken 2022-03-15 00:17:58 +01:00
parent 24f0fec405
commit b478d59e9d
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/warnless.c
View File

@ -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__)

6
lib/warnless.h
View File

@ -22,6 +22,8 @@
*
***************************************************************************/
#include "curl_setup.h"
#ifdef USE_WINSOCK
#include <curl/curl.h> /* 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__)