[proxy] github.com — ← back | site home | direct (HTTPS) ↗ | proxy home | ◑ dark◐ light
/ cpython Public

Conversation

Copy link
Contributor

erikjanss commented May 21, 2019 •
edited by bedevere-bot
Loading

erikjanss added 2 commits May 21, 2019 21:21
bpo-36965: Fix includes in main.c on Windows with non-MSC compilers (p…
83c14f7 
…ythonGH-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.

(cherry picked from commit 925af1d)
[3.7] bpo-36965: Fix includes in main.c on Windows with non-MSC compi…
220fdec 
…lers (pythonGH-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..
(cherry picked from commit 925af1d)

Co-authored-by: Erik Janssens <erik.janssens@conceptive.be>
eamanu reviewed May 22, 2019
View reviewed changes
Copy link
Contributor

eamanu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good. But I think that will be open a issue an explain a little more
what are you doing that :-)

erikjanss changed the title Backport 925af1d 3.7 bpo-36965: replace include of crtdbg.h with windows.h, backport 925af1d 3.7 May 22, 2019
erikjanss changed the title bpo-36965: replace include of crtdbg.h with windows.h, backport 925af1d 3.7 [3.7] bpo-36965: replace include of crtdbg.h with windows.h, backport 925af1d 3.7 (GH-13421) May 22, 2019
bedevere-bot mentioned this pull request May 22, 2019
Merged
Copy link
Contributor Author

erikjanss commented May 22, 2019

it's a manual backport of GH-13421, this is the first time I went trough the manual cherry picking process ... so I didn't notice the required title format ...

vstinner merged commit 791e5fc into python:3.7 May 22, 2019
Copy link
Member

vstinner commented May 22, 2019

I fixed the commit message and merged your PR, thanks.

Copy link
Contributor Author

erikjanss commented May 22, 2019

Thank you !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

eamanu eamanu left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants