Skip to content

[3.13] gh-116984: Make mimalloc header includes relative to the current file (GH-118808) #118866

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
colesbury merged 1 commit into from
May 9, 2024
Merged

[3.13] gh-116984: Make mimalloc header includes relative to the current file (GH-118808) #118866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
gh-116984: Make mimalloc header includes relative to the current file (… 
…GH-118808)

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 71cc065)

Co-authored-by: Sam Gross <colesbury@gmail.com>
  • Loading branch information
@colesbury @miss-islington
colesbury authored and miss-islington committed May 9, 2024
commit 41973dc11a4e4e8772a3111d51fcf15ef6383e32
4 changes: 2 additions & 2 deletions Include/internal/mimalloc/mimalloc/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
2 changes: 1 addition & 1 deletion Include/internal/mimalloc/mimalloc/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Include/internal/pycore_mimalloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/C API/2024-05-08-23-14-06.gh-issue-116984.5sgcDo.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.