Skip to content

Move definition of _Py_thread_local back to pyport.h #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZeroIntensity merged 2 commits into from
Oct 28, 2025
Merged

Move definition of _Py_thread_local back to pyport.h #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2dde90
Remove _Py_thread_local macro definition
ZeroIntensity Oct 28, 2025
bb61072
Move back to pyport.h
ZeroIntensity Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions Include/internal/pycore_pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,6 @@ _Py_ThreadCanHandleSignals(PyInterpreterState *interp)
return (_Py_IsMainThread() && _Py_IsMainInterpreter(interp));
}

/* Definition of the _Py_thread_local macro. In reality, this should really be
* in pyport.h, but some extensions define Py_BUILD_CORE after including that.
* So, instead of breaking things, we just put this here for now. */

#ifdef thread_local
# define _Py_thread_local thread_local
#elif __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__)
# define _Py_thread_local _Thread_local
#elif defined(_MSC_VER) /* AKA NT_THREADS */
# define _Py_thread_local __declspec(thread)
#elif defined(__GNUC__) /* includes clang */
# define _Py_thread_local __thread
#else
# error "no supported thread-local variable storage classifier"
#endif

/* Variable and static inline functions for in-line access to current thread
and interpreter state */

Expand Down
11 changes: 11 additions & 0 deletions Include/pyport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,17 @@ extern "C" {
#ifdef WITH_THREAD
// HAVE_THREAD_LOCAL is just defined here for compatibility's sake
# define HAVE_THREAD_LOCAL 1
# ifdef thread_local
# define _Py_thread_local thread_local
# elif __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__)
# define _Py_thread_local _Thread_local
# elif defined(_MSC_VER) /* AKA NT_THREADS */
# define _Py_thread_local __declspec(thread)
# elif defined(__GNUC__) /* includes clang */
# define _Py_thread_local __thread
# else
# error "no supported thread-local variable storage classifier"
# endif
#endif

#if defined(__ANDROID__) || defined(__VXWORKS__)
Expand Down