https://github.com/python/cpython/commit/125ca028664ce72556e3983b57f521a118c4e677
commit: 125ca028664ce72556e3983b57f521a118c4e677
branch: 3.13
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: vstinner <vstin...@python.org>
date: 2025-02-28T08:22:15Z
summary:
[3.13] gh-129296: Fix `pyatomic.h` include paths (GH-129320) (#130667)
gh-129296: Fix `pyatomic.h` include paths (GH-129320)
Use relative includes in Include/cpython/pyatomic.h for
pyatomic_gcc.h, pyatomic_std.h and pyatomic_msc.h.
Do a similar change in Include/cpython/pythread.h for
pthread_stubs.h include.
(cherry picked from commit 3a974e39d54902699f360bc4db2fd351a6baf3ef)
Co-authored-by: Zanie Blue <cont...@zanie.dev>
files:
M Include/cpython/pyatomic.h
M Include/cpython/pythread.h
diff --git a/Include/cpython/pyatomic.h b/Include/cpython/pyatomic.h
index 4ecef4f56edf42..28029859d3df2b 100644
--- a/Include/cpython/pyatomic.h
+++ b/Include/cpython/pyatomic.h
@@ -529,15 +529,15 @@ static inline void _Py_atomic_fence_release(void);
#if _Py_USE_GCC_BUILTIN_ATOMICS
# define Py_ATOMIC_GCC_H
-# include "cpython/pyatomic_gcc.h"
+# include "pyatomic_gcc.h"
# undef Py_ATOMIC_GCC_H
#elif __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
# define Py_ATOMIC_STD_H
-# include "cpython/pyatomic_std.h"
+# include "pyatomic_std.h"
# undef Py_ATOMIC_STD_H
#elif defined(_MSC_VER)
# define Py_ATOMIC_MSC_H
-# include "cpython/pyatomic_msc.h"
+# include "pyatomic_msc.h"
# undef Py_ATOMIC_MSC_H
#else
# error "no available pyatomic implementation for this platform/compiler"
diff --git a/Include/cpython/pythread.h b/Include/cpython/pythread.h
index 03f710a9f7ef2e..e658b35bd90700 100644
--- a/Include/cpython/pythread.h
+++ b/Include/cpython/pythread.h
@@ -22,7 +22,7 @@ PyAPI_DATA(const long long) PY_TIMEOUT_MAX;
*/
# define NATIVE_TSS_KEY_T unsigned long
#elif defined(HAVE_PTHREAD_STUBS)
-# include "cpython/pthread_stubs.h"
+# include "pthread_stubs.h"
# define NATIVE_TSS_KEY_T pthread_key_t
#else
# error "Require native threads. See https://bugs.python.org/issue31370";
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
