Do not depend on pymemcompat.h (was only used for PyXML); Martin likes

it all inline.

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index eac92cb4a1f48013f5dd6d8797c7ba4914f99376..396986accb1cc7c3c64ec3f24ee04e2c76dd47a6 100644 (file)
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1,10 +1,6 @@
 #include "Python.h"
 #include <ctype.h>
 
-#ifdef HAVE_PYMEMCOMPAT_H
-#include "pymemcompat.h"
-#endif
-
 #include "compile.h"
 #include "frameobject.h"
 #include "expat.h"
@@ -973,7 +969,13 @@ xmlparse_ExternalEntityParserCreate(xmlparseobject *self, PyObject *args)
     if (self->buffer != NULL) {
         new_parser->buffer = malloc(new_parser->buffer_size);
         if (new_parser->buffer == NULL) {
+#ifndef Py_TPFLAGS_HAVE_GC
+            /* Code for versions 2.0 and 2.1 */
+            PyObject_Del(new_parser);
+#else
+            /* Code for versions 2.2 and later. */
             PyObject_GC_Del(new_parser);
+#endif
             return PyErr_NoMemory();
         }
     }