mirror of
https://github.com/curl/curl.git
synced 2026-08-25 19:43:33 +03:00
windows: use built-in _WIN32 macro to detect Windows
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
This commit is contained in:
parent
1c37d472a0
commit
e9a7d4a1c8
99 changed files with 223 additions and 227 deletions
|
|
@ -206,7 +206,7 @@ size_t Curl_is_absolute_url(const char *url, char *buf, size_t buflen,
|
|||
(void)buflen; /* only used in debug-builds */
|
||||
if(buf)
|
||||
buf[0] = 0; /* always leave a defined value in buf */
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
if(guess_scheme && STARTS_WITH_DRIVE_PREFIX(url))
|
||||
return 0;
|
||||
#endif
|
||||
|
|
@ -1056,7 +1056,7 @@ static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags)
|
|||
ptr += 9; /* now points to the slash after the host */
|
||||
}
|
||||
else {
|
||||
#if defined(WIN32)
|
||||
#if defined(_WIN32)
|
||||
size_t len;
|
||||
|
||||
/* the host name, NetBIOS computer name, can not contain disallowed
|
||||
|
|
@ -1095,7 +1095,7 @@ static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags)
|
|||
/* no host for file: URLs by default */
|
||||
Curl_dyn_reset(&host);
|
||||
|
||||
#if !defined(MSDOS) && !defined(WIN32) && !defined(__CYGWIN__)
|
||||
#if !defined(_WIN32) && !defined(MSDOS) && !defined(__CYGWIN__)
|
||||
/* Don't allow Windows drive letters when not in Windows.
|
||||
* This catches both "file:/c:" and "file:c:" */
|
||||
if(('/' == path[0] && STARTS_WITH_URL_DRIVE_PREFIX(&path[1])) ||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue