mirror of
https://github.com/python/cpython.git
synced 2024-11-23 09:54:58 +08:00
gh-90815: Fix _PyMem_MimallocEnabled() compiler warning (#111522)
Don't declare _PyMem_MimallocEnabled() if WITH_PYMALLOC macro is not defined (./configure --without-pymalloc). Fix also a typo in _PyInterpreterState_FinalizeAllocatedBlocks().
This commit is contained in:
parent
804a207c16
commit
da4d3142a2
@ -561,14 +561,13 @@ _PyMem_GetCurrentAllocatorName(void)
|
||||
}
|
||||
|
||||
|
||||
#if defined(WITH_PYMALLOC) || defined(WITH_MIMALLOC)
|
||||
#ifdef WITH_PYMALLOC
|
||||
static int
|
||||
_PyMem_DebugEnabled(void)
|
||||
{
|
||||
return (_PyObject.malloc == _PyMem_DebugMalloc);
|
||||
}
|
||||
|
||||
#ifdef WITH_PYMALLOC
|
||||
static int
|
||||
_PyMem_PymallocEnabled(void)
|
||||
{
|
||||
@ -579,7 +578,7 @@ _PyMem_PymallocEnabled(void)
|
||||
return (_PyObject.malloc == _PyObject_Malloc);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WITH_MIMALLOC
|
||||
static int
|
||||
_PyMem_MimallocEnabled(void)
|
||||
@ -591,8 +590,9 @@ _PyMem_MimallocEnabled(void)
|
||||
return (_PyObject.malloc == _PyObject_MiMalloc);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif // defined(WITH_PYMALLOC) || defined(WITH_MIMALLOC)
|
||||
#endif // WITH_MIMALLOC
|
||||
|
||||
#endif // WITH_PYMALLOC
|
||||
|
||||
|
||||
static void
|
||||
@ -1073,7 +1073,7 @@ _PyInterpreterState_GetAllocatedBlocks(PyInterpreterState *interp)
|
||||
void
|
||||
_PyInterpreterState_FinalizeAllocatedBlocks(PyInterpreterState *interp)
|
||||
{
|
||||
#ifdef WITH_MIAMLLOC
|
||||
#ifdef WITH_MIMALLOC
|
||||
if (_PyMem_MimallocEnabled()) {
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user