FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN by maxbachmann · Pull Request #131044 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN - #131044

Merged
vstinner merged 2 commits into
python:mainfrom
maxbachmann:patch-16
Mar 11, 2025
ConversationCommits (2)ChecksFiles changed
Merged

gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN#131044
vstinner merged 2 commits into
python:mainfrom
maxbachmann:patch-16

Conversation

maxbachmann commented Mar 10, 2025 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Contributor

This adds missing guards for the WIN32_LEAN_AND_MEAN macro. I am working on the xbox where the toolchain already adds this definition. This leads to warnings about the macro getting redefined.

I think this should be trivial enough to require no issue / news entry

vstinner reviewed Mar 11, 2025
View reviewed changes
Comment thread Include/internal/pycore_condvar.h Outdated
Comment thread Modules/_interpchannelsmodule.c Outdated

vstinner commented Mar 11, 2025

Copy link
Copy Markdown
Member

I think this should be trivial enough to require no issue / news entry

Please open an issue. I would like to backport this fix to 3.12 and 3.13, having an issue helps tracking backports.

vstinner added skip news needs backport to 3.12 only security fixes needs backport to 3.13 only security fixes labels Mar 11, 2025
maxbachmann changed the title Add missing guards for WIN32_LEAN_AND_MEAN gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN Mar 11, 2025
bedevere-app Bot mentioned this pull request Mar 11, 2025
Closed

maxbachmann commented Mar 11, 2025

Copy link
Copy Markdown
Contributor Author

I opened an issue and added the whitespaces for readability

vstinner merged commit de8818a into python:main Mar 11, 2025

miss-islington-app Bot commented Mar 11, 2025

Copy link
Copy Markdown

Thanks @maxbachmann for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 11, 2025
pythongh-131082: Add missing guards for WIN32_LEAN_AND_MEAN (pythonGH…
5e6a5ab 
…-131044)

* Add missing guards for WIN32_LEAN_AND_MEAN

* add missing whitespaces
(cherry picked from commit de8818a)

Co-authored-by: Max Bachmann <kontakt@maxbachmann.de>

miss-islington-app Bot commented Mar 11, 2025

Copy link
Copy Markdown

Sorry, @maxbachmann and @vstinner, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker de8818ae233b8e7722aa5d6f91d4b5a04bd039df 3.12

bedevere-app Bot commented Mar 11, 2025

Copy link
Copy Markdown

GH-131084 is a backport of this pull request to the 3.13 branch.

bedevere-app Bot removed the needs backport to 3.13 only security fixes label Mar 11, 2025

bedevere-app Bot commented Mar 11, 2025

Copy link
Copy Markdown

GH-131085 is a backport of this pull request to the 3.12 branch.

bedevere-app Bot removed the needs backport to 3.12 only security fixes label Mar 11, 2025

vstinner commented Mar 11, 2025

Copy link
Copy Markdown
Member

Merged, thank you. I created backports.

vstinner added a commit that referenced this pull request Mar 11, 2025
[3.12] gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN (#131044) (
3f226c5 
#131085)

gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN (#131044)

(cherry picked from commit de8818a)

Co-authored-by: Max Bachmann <kontakt@maxbachmann.de>
vstinner pushed a commit that referenced this pull request Mar 11, 2025
[3.13] gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN (GH-131044…
f9d19a3 
…) (#131084)

(cherry picked from commit de8818a)

Co-authored-by: Max Bachmann <kontakt@maxbachmann.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

vstinner vstinner left review comments
ericsnowcurrently Awaiting requested review from ericsnowcurrently ericsnowcurrently is a code owner

Assignees

vstinner

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

Back | FazBrowse Home | New Git URL