mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
[3.13] gh-116984: Make mimalloc header includes relative to the current file (GH-118808) (#118866)
Some embedders and extensions include parts of the internal API. The
pycore_mimalloc.h file is transitively include by a number of other
internal headers. This avoids include errors for code that was
already including those headers.
(cherry picked from commit 71cc0651e7
)
Co-authored-by: Sam Gross <colesbury@gmail.com>
This commit is contained in:
parent
846cfb9a67
commit
0a23970478
4 changed files with 9 additions and 6 deletions
|
@ -14,8 +14,8 @@ terms of the MIT license. A copy of the license can be found in the file
|
|||
// functions and macros.
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
#include "mimalloc/types.h"
|
||||
#include "mimalloc/track.h"
|
||||
#include "types.h"
|
||||
#include "track.h"
|
||||
|
||||
#if (MI_DEBUG>0)
|
||||
#define mi_trace_message(...) _mi_trace_message(__VA_ARGS__)
|
||||
|
|
|
@ -21,7 +21,7 @@ terms of the MIT license. A copy of the license can be found in the file
|
|||
|
||||
#include <stddef.h> // ptrdiff_t
|
||||
#include <stdint.h> // uintptr_t, uint16_t, etc
|
||||
#include "mimalloc/atomic.h" // _Atomic
|
||||
#include "atomic.h" // _Atomic
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable:4214) // bitfield is not int
|
||||
|
|
|
@ -36,9 +36,9 @@ typedef enum {
|
|||
# define MI_TSAN 1
|
||||
#endif
|
||||
|
||||
#include "mimalloc.h"
|
||||
#include "mimalloc/types.h"
|
||||
#include "mimalloc/internal.h"
|
||||
#include "mimalloc/mimalloc.h"
|
||||
#include "mimalloc/mimalloc/types.h"
|
||||
#include "mimalloc/mimalloc/internal.h"
|
||||
#endif
|
||||
|
||||
#ifdef Py_GIL_DISABLED
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
Make mimalloc includes relative to the current file to avoid embedders or
|
||||
extensions needing to include ``Internal/mimalloc`` if they are already
|
||||
including internal CPython headers.
|
Loading…
Add table
Add a link
Reference in a new issue