mirror of
https://github.com/curl/curl.git
synced 2024-11-27 05:50:21 +08:00
e9a7d4a1c8
Windows compilers define `_WIN32` automatically. Windows SDK headers or build env defines `WIN32`, or we have to take care of it. The agreement seems to be that `_WIN32` is the preferred practice here. Make the source code rely on that to detect we're building for Windows. Public `curl.h` was using `WIN32`, `__WIN32__` and `CURL_WIN32` for Windows detection, next to the official `_WIN32`. After this patch it only uses `_WIN32` for this. Also, make it stop defining `CURL_WIN32`. There is a slight chance these break compatibility with Windows compilers that fail to define `_WIN32`. I'm not aware of any obsolete or modern compiler affected, but in case there is one, one possible solution is to define this macro manually. grepping for `WIN32` remains useful to discover Windows-specific code. Also: - extend `checksrc` to ensure we're not using `WIN32` anymore. - apply minor formatting here and there. - delete unnecessary checks for `!MSDOS` when `_WIN32` is present. Co-authored-by: Jay Satiro Reviewed-by: Daniel Stenberg Closes #12376
107 lines
2.7 KiB
C
107 lines
2.7 KiB
C
#ifndef HEADER_CURL_WARNLESS_H
|
|
#define HEADER_CURL_WARNLESS_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef USE_WINSOCK
|
|
#include <curl/curl.h> /* for curl_socket_t */
|
|
#endif
|
|
|
|
#define CURLX_FUNCTION_CAST(target_type, func) \
|
|
(target_type)(void (*) (void))(func)
|
|
|
|
unsigned short curlx_ultous(unsigned long ulnum);
|
|
|
|
unsigned char curlx_ultouc(unsigned long ulnum);
|
|
|
|
int curlx_uztosi(size_t uznum);
|
|
|
|
curl_off_t curlx_uztoso(size_t uznum);
|
|
|
|
unsigned long curlx_uztoul(size_t uznum);
|
|
|
|
unsigned int curlx_uztoui(size_t uznum);
|
|
|
|
int curlx_sltosi(long slnum);
|
|
|
|
unsigned int curlx_sltoui(long slnum);
|
|
|
|
unsigned short curlx_sltous(long slnum);
|
|
|
|
ssize_t curlx_uztosz(size_t uznum);
|
|
|
|
size_t curlx_sotouz(curl_off_t sonum);
|
|
|
|
int curlx_sztosi(ssize_t sznum);
|
|
|
|
unsigned short curlx_uitous(unsigned int uinum);
|
|
|
|
size_t curlx_sitouz(int sinum);
|
|
|
|
#ifdef USE_WINSOCK
|
|
|
|
int curlx_sktosi(curl_socket_t s);
|
|
|
|
curl_socket_t curlx_sitosk(int i);
|
|
|
|
#endif /* USE_WINSOCK */
|
|
|
|
#if defined(_WIN32)
|
|
|
|
ssize_t curlx_read(int fd, void *buf, size_t count);
|
|
|
|
ssize_t curlx_write(int fd, const void *buf, size_t count);
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
#if defined(__INTEL_COMPILER) && defined(__unix__)
|
|
|
|
int curlx_FD_ISSET(int fd, fd_set *fdset);
|
|
|
|
void curlx_FD_SET(int fd, fd_set *fdset);
|
|
|
|
void curlx_FD_ZERO(fd_set *fdset);
|
|
|
|
unsigned short curlx_htons(unsigned short usnum);
|
|
|
|
unsigned short curlx_ntohs(unsigned short usnum);
|
|
|
|
#endif /* __INTEL_COMPILER && __unix__ */
|
|
|
|
#endif /* HEADER_CURL_WARNLESS_H */
|
|
|
|
#ifndef HEADER_CURL_WARNLESS_H_REDEFS
|
|
#define HEADER_CURL_WARNLESS_H_REDEFS
|
|
|
|
#if defined(_WIN32)
|
|
#undef read
|
|
#define read(fd, buf, count) curlx_read(fd, buf, count)
|
|
#undef write
|
|
#define write(fd, buf, count) curlx_write(fd, buf, count)
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_WARNLESS_H_REDEFS */
|