mirror of
https://github.com/curl/curl.git
synced 2026-08-25 12:33:35 +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
|
|
@ -46,7 +46,7 @@
|
|||
# include iodef
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
# include <conio.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
|
|||
#define DONE
|
||||
#endif /* __VMS */
|
||||
|
||||
#if defined(WIN32)
|
||||
#if defined(_WIN32)
|
||||
|
||||
char *getpass_r(const char *prompt, char *buffer, size_t buflen)
|
||||
{
|
||||
|
|
@ -122,7 +122,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
|
|||
return buffer; /* we always return success */
|
||||
}
|
||||
#define DONE
|
||||
#endif /* WIN32 */
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#ifndef DONE /* not previously provided */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue