From: Victor Stinner <vstinner@python.org>
Date: Mon, 30 Oct 2023 22:05:49 +0000 (+0100)
Subject: gh-90815: Fix _PyMem_MimallocEnabled() compiler warning (#111522)
X-Git-Tag: v3.13.0a2~272
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da4d3142a247fc77da508a4b3261e6642a196052;p=thirdparty%2FPython%2Fcpython.git

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().
---

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 5927d1656f5e..d230bbdad3c4 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -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;
     }