Restore uint for obmalloc.

Author: ericsnowcurrently

Include/internal/pycore_obmalloc.h

@@ -8,6 +8,11 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
+
+#undef  uint
+#define uint    unsigned int    /* assuming >= 16 bits */
+
+
 /* An object allocator for Python.
 
    Here is an introduction to the layers of the Python memory architecture,

Modules/_ctypes/_ctypes.c

@@ -113,6 +113,8 @@ bytes(cdata)
 #include "pycore_ceval.h"         // _Py_EnterRecursiveCall()
 #include "structmember.h"         // PyMemberDef
 
+#undef uint  // from pycore_obmalloc.h
+
 #include <ffi.h>
 #ifdef MS_WIN32
 #include <malloc.h>

Modules/_ctypes/callbacks.c

@@ -18,6 +18,8 @@
 #  include <malloc.h>
 #endif
 
+#undef uint  // from pycore_obmalloc.h
+
 #include <ffi.h>
 #include "ctypes.h"
 

Modules/_ctypes/cfield.c

@@ -11,6 +11,8 @@
 #include "pycore_bitutils.h"      // _Py_bswap32()
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 
+#undef uint  // from pycore_obmalloc.h
+
 #include <ffi.h>
 #include "ctypes.h"
 

Modules/_ctypes/stgdict.c

@@ -9,6 +9,9 @@
 #endif
 
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
+
+#undef uint  // from pycore_obmalloc.h
+
 #include <ffi.h>
 #ifdef MS_WIN32
 #  include <malloc.h>

Objects/obmalloc.c

@@ -1,7 +1,8 @@
 #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"
 
@@ -14,9 +15,6 @@ 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);