Restore uint for obmalloc.

Author: ericsnowcurrently

Include/internal/pycore_obmalloc.h

@@ -8,6 +8,13 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
+
+typedef unsigned int pymem_uint;  /* assuming >= 16 bits */
+
+#undef  uint
+#define uint pymem_uint
+
+
 /* An object allocator for Python.
 
    Here is an introduction to the layers of the Python memory architecture,
@@ -130,7 +137,7 @@ extern "C" {
 #endif
 
 /* Return the number of bytes in size class I, as a uint. */
-#define INDEX2SIZE(I) (((uint)(I) + 1) << ALIGNMENT_SHIFT)
+#define INDEX2SIZE(I) (((pymem_uint)(I) + 1) << ALIGNMENT_SHIFT)
 
 /*
  * Max size threshold below which malloc requests are considered to be
@@ -307,7 +314,7 @@ struct arena_object {
 #define POOL_ADDR(P) ((poolp)_Py_ALIGN_DOWN((P), POOL_SIZE))
 
 /* Return total number of blocks in pool of size index I, as a uint. */
-#define NUMBLOCKS(I) ((uint)(POOL_SIZE - POOL_OVERHEAD) / INDEX2SIZE(I))
+#define NUMBLOCKS(I) ((pymem_uint)(POOL_SIZE - POOL_OVERHEAD) / INDEX2SIZE(I))
 
 /*==========================================================================*/
 
@@ -657,6 +664,9 @@ struct _obmalloc_state {
 };
 
 
+#undef  uint
+
+
 /* Allocate memory directly from the O/S virtual memory system,
  * where supported. Otherwise fallback on malloc */
 void *_PyObject_VirtualAlloc(size_t size);

Objects/obmalloc.c

@@ -1,22 +1,24 @@
 #include "Python.h"
-#include "pycore_pymem.h"         // _PyTraceMalloc_Config
 #include "pycore_code.h"          // stats
 #include "pycore_pystate.h"       // _PyInterpreterState_GET
+
+#include "pycore_obmalloc.h"
 #include "pycore_pymem.h"
 #include "pycore_pymem_allocators.h"
 
 #include <stdbool.h>
 
 
+#undef  uint
+#define uint pymem_uint
+
+
 /* Defined in tracemalloc.c */
 extern void _PyMem_DumpTraceback(int fd, const void *ptr);
 
 
 /* Python's malloc wrappers (see pymem.h) */
 
-#undef  uint
-#define uint    unsigned int    /* assuming >= 16 bits */
-
 static void _PyObject_DebugDumpAddress(const void *p);
 static void _PyMem_DebugCheckAddress(const char *func, char api_id, const void *p);