Skip to content

gh-160208: Add a private wrapper around __STDC_VERSION__ - #160376

Merged
encukou merged 2 commits into
python:mainfrom
encukou:std-macros
Oct 23, 2026
Merged

gh-160208: Add a private wrapper around __STDC_VERSION__#160376
encukou merged 2 commits into
python:mainfrom
encukou:std-macros

Conversation

@encukou

@encukou encukou commented Oct 22, 2026 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

C++ allows __STDC_VERSION__ to have any compiler-specific value, unrelated to the version of the C standard.

Add a wrapper around __STDC_VERSION__ which is undefined on C++.

Also, remove _Py_thread_local definition from _ctypes_test.c: it duplicated pyport.h which is included in that file.

@encukou
pythongh-160208: Add a private wrapper around __STDC_VERSION__
f95348a 
The wrapper is undefined on C++, where it can have an arbitrary
compiler-specific value.
@encukou
encukou requested a review from vstinner October 22, 2026 22:17
@encukou
encukou marked this pull request as ready for review October 22, 2026 22:17
@bedevere-app bedevere-app Bot mentioned this pull request Oct 22, 2026
Closed
@encukou encukou mentioned this pull request Oct 22, 2026
Closed
vstinner
vstinner reviewed Oct 22, 2026
View reviewed changes
Comment thread Include/internal/mimalloc/mimalloc/atomic.h Outdated
#define mi_atomic(name) atomic_##name
#define mi_memory_order(name) memory_order_##name
#if (__STDC_VERSION__ >= 201710L) // c17, see issue #735
#if (_Py_STDC_VERSION >= 201710L) // c17, see issue #735

@vstinner vstinner Oct 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm not sure that it's a good idea to modify this file, since it's a vendored copy of mimalloc, which can be updated time to time. If the mimalloc code is wrong on OpenIndiana, it would be better to fix the issue in mimalloc upstream. So for now, I would like suggest leaving this file unchanged in Python.

@vstinner

vstinner commented Oct 22, 2026

Copy link
Copy Markdown
Member

I confirm that this change fix #160208 on OpenIndiana.

@encukou encukou added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Oct 22, 2026
@bedevere-bot

bedevere-bot commented Oct 22, 2026

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @encukou for commit 9fc26b4 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F160376%2Fmerge

If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Oct 22, 2026
@encukou
encukou merged commit 8335bcb into python:main Oct 23, 2026
137 of 139 checks passed
@encukou
encukou deleted the std-macros branch October 23, 2026 15:40
@encukou encukou added needs backport to 3.14 bugs and security fixes needs backport to 3.15 bugs and security fixes labels Oct 23, 2026
@miss-islington-app

miss-islington-app Bot commented Oct 23, 2026

Copy link
Copy Markdown

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Oct 23, 2026

Copy link
Copy Markdown

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.15.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Oct 23, 2026

Copy link
Copy Markdown

Sorry, @encukou, I could not cleanly backport this to 3.14 due to a conflict.

Please backport manually with cherry_picker, see the devguide for more information.

cherry_picker 8335bcbf26bf542b751dab4c0e031aba3672d6e4 3.14

@bedevere-app

bedevere-app Bot commented Oct 23, 2026

Copy link
Copy Markdown

GH-160437 is a backport of this pull request to the 3.15 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.15 bugs and security fixes label Oct 23, 2026
@encukou encukou removed the needs backport to 3.14 bugs and security fixes label Oct 23, 2026
encukou added a commit that referenced this pull request Oct 23, 2026
@miss-islington @encukou
[3.15] gh-160208: Add a private wrapper around __STDC_VERSION__ (GH-1…
47163e5 
…60376) (GH-160437)

gh-160208: Add a private wrapper around __STDC_VERSION__ (GH-160376)

The wrapper is undefined on C++, where it can have an arbitrary
compiler-specific value.
(cherry picked from commit 8335bcb)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
@encukou

encukou commented Oct 23, 2026

Copy link
Copy Markdown
Member Author

The issue is about _Py_ANONYMOUS which is 3.15+ only, so backported there but not to 3.14.

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

Reviewers

@vstinner vstinner vstinner left review comments

Assignees

@encukou encukou

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@encukou @vstinner @bedevere-bot