Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-116984: Make mimalloc header includes relative to the current file#118808

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
Some embedders and extensions include parts of the internal API. Thepycore_mimalloc.h file is transitively include by a number of otherinternal headers. This avoids include errors for code that wasalready including those headers.
  • Loading branch information
@colesbury
colesbury committedMay 8, 2024
commit74ebbeee5885ed0629b215cb11dbe620b68ae3e8
4 changes: 2 additions & 2 deletionsInclude/internal/mimalloc/mimalloc/internal.h
View file
Open in desktop
Original file line numberDiff line numberDiff 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 deletionInclude/internal/mimalloc/mimalloc/types.h
View file
Open in desktop
Original file line numberDiff line numberDiff 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 deletionsInclude/internal/pycore_mimalloc.h
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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.
[8]ページ先頭
©2009-2025 Movatter.jp