diff options
| author | Erik Janssens <erik.janssens@conceptive.be> | 2019-05-21 10:11:11 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2019-05-21 10:11:11 (GMT) |
| commit | 925af1d99b69bf3e229411022ad840c5a0cfdcf8 (patch) | |
| tree | 2b21d89f4432b3f6b80c7c54b4ad6deab72e0f01 | |
| parent | e7cb23bf2079087068a08502f96fdf20b317d69c (diff) | |
| download | cpython-925af1d99b69bf3e229411022ad840c5a0cfdcf8.zip cpython-925af1d99b69bf3e229411022ad840c5a0cfdcf8.tar.gz cpython-925af1d99b69bf3e229411022ad840c5a0cfdcf8.tar.bz2 | |
bpo-36965: Fix includes in main.c on Windows with non-MSC compilers (GH-13421)
Include windows.h rather than crtdbg.h to get STATUS_CONTROL_C_EXIT constant.
Moreover, include windows.h on Windows, not only when MSC is used.
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2019-05-20-20-26-36.bpo-36965.KsfI-N.rst | 1 | ||||
| -rw-r--r-- | Modules/main.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Windows/2019-05-20-20-26-36.bpo-36965.KsfI-N.rst b/Misc/NEWS.d/next/Windows/2019-05-20-20-26-36.bpo-36965.KsfI-N.rst new file mode 100644 index 0000000..2a531d2 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-05-20-20-26-36.bpo-36965.KsfI-N.rst @@ -0,0 +1 @@ +include of STATUS_CONTROL_C_EXIT without depending on MSC compiler diff --git a/Modules/main.c b/Modules/main.c index 6d4b351..08fb0e0 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -18,8 +18,8 @@ #if defined(HAVE_GETPID) && defined(HAVE_UNISTD_H) # include <unistd.h> /* getpid() */ #endif -#ifdef _MSC_VER -# include <crtdbg.h> /* STATUS_CONTROL_C_EXIT */ +#ifdef MS_WINDOWS +# include <windows.h> /* STATUS_CONTROL_C_EXIT */ #endif /* End of includes for exit_sigint() */ |