commit 4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9
author Martin v. Löwis <martin@v.loewis.de> Fri Dec 03 20:14:31 2010 +0000
committer Martin v. Löwis <martin@v.loewis.de> Fri Dec 03 20:14:31 2010 +0000
tree c8f1fef715f8d158e58f17cab14af65455de1d77
parent c4df7845143f9afe0d20f4421a41904f3cbb991a

Merge branches/pep-0384.

Objects/object.c

diff --git a/Objects/object.c b/Objects/object.c
index 082dd78..17e5069 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1755,7 +1755,6 @@
 
 #endif
 
-
 /* Hack to force loading of pycapsule.o */
 PyTypeObject *_PyCapsule_hack = &PyCapsule_Type;
 
@@ -1900,6 +1899,19 @@
     }
 }
 
+#ifndef Py_TRACE_REFS
+/* For Py_LIMITED_API, we need an out-of-line version of _Py_Dealloc.
+   Define this here, so we can undefine the macro. */
+#undef _Py_Dealloc
+PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
+void
+_Py_Dealloc(PyObject *op)
+{
+    _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA
+    (*Py_TYPE(op)->tp_dealloc)(op);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif