Move definition of _Py_thread_local back to pyport.h

Author: ZeroIntensity

Include/internal/pycore_pystate.h

@@ -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 */
 

Include/pyport.h

@@ -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__)