Skip to content

Commit cb32439

Browse files
zaniebmiss-islington
authored andcommitted
pythongh-129296: Fix pyatomic.h include paths (pythonGH-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 3a974e3) Co-authored-by: Zanie Blue <contact@zanie.dev>
1 parent 797aac7 commit cb32439

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Include/cpython/pyatomic.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -529,15 +529,15 @@ static inline void _Py_atomic_fence_release(void);
529529

530530
#if _Py_USE_GCC_BUILTIN_ATOMICS
531531
# define Py_ATOMIC_GCC_H
532-
# include "cpython/pyatomic_gcc.h"
532+
# include "pyatomic_gcc.h"
533533
# undef Py_ATOMIC_GCC_H
534534
#elif __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
535535
# define Py_ATOMIC_STD_H
536-
# include "cpython/pyatomic_std.h"
536+
# include "pyatomic_std.h"
537537
# undef Py_ATOMIC_STD_H
538538
#elif defined(_MSC_VER)
539539
# define Py_ATOMIC_MSC_H
540-
# include "cpython/pyatomic_msc.h"
540+
# include "pyatomic_msc.h"
541541
# undef Py_ATOMIC_MSC_H
542542
#else
543543
# error "no available pyatomic implementation for this platform/compiler"

Include/cpython/pythread.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PyAPI_DATA(const long long) PY_TIMEOUT_MAX;
2222
*/
2323
# define NATIVE_TSS_KEY_T unsigned long
2424
#elif defined(HAVE_PTHREAD_STUBS)
25-
# include "cpython/pthread_stubs.h"
25+
# include "pthread_stubs.h"
2626
# define NATIVE_TSS_KEY_T pthread_key_t
2727
#else
2828
# error "Require native threads. See https://bugs.python.org/issue31370"

0 commit comments

Comments
 (0)