commit 15932593bae491ffad73f690c8a2bcf6f91a085b
author Victor Stinner <victor.stinner@gmail.com> Fri Apr 22 18:52:22 2016 +0200
committer Victor Stinner <victor.stinner@gmail.com> Fri Apr 22 18:52:22 2016 +0200
tree 16de7738d94e4eafd289a1ef45c9badfb6782ae2
parent f5c4b99034fae12ac2b9498dd12b5b3f352b90c8

Issue #26249: Try test_capi on Windows

Objects/obmalloc.c

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index d305b1d..3f95133 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -166,7 +166,7 @@
 #else
 #  define PYOBJ_FUNCS PYRAW_FUNCS
 #endif
-#define PYMEM_FUNCS PYRAW_FUNCS
+#define PYMEM_FUNCS PYOBJ_FUNCS
 
 typedef struct {
     /* We tag each block with an API ID in order to tag API violations */
@@ -198,9 +198,9 @@
 
 static PyMemAllocatorEx _PyMem = {
 #ifdef Py_DEBUG
-    &_PyMem_Debug.obj, PYDBG_FUNCS
+    &_PyMem_Debug.mem, PYDBG_FUNCS
 #else
-    NULL, PYOBJ_FUNCS
+    NULL, PYMEM_FUNCS
 #endif
     };
 
@@ -252,11 +252,12 @@
     else if (strcmp(opt, "pymalloc") == 0
              || strcmp(opt, "pymalloc_debug") == 0)
     {
-        PyMemAllocatorEx mem_alloc = {NULL, PYRAW_FUNCS};
+        PyMemAllocatorEx raw_alloc = {NULL, PYRAW_FUNCS};
+        PyMemAllocatorEx mem_alloc = {NULL, PYMEM_FUNCS};
         PyMemAllocatorEx obj_alloc = {NULL, PYOBJ_FUNCS};
 
-        PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &mem_alloc);
-        PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &obj_alloc);
+        PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &raw_alloc);
+        PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &mem_alloc);
         PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &obj_alloc);
 
         if (strcmp(opt, "pymalloc_debug") == 0)