Py2.4 requires some more definitions for the set type

diff --git a/Cython/Compiler/Builtin.py b/Cython/Compiler/Builtin.py
index 60c2deafddea20489a8d599bb8aad6666c95ca1e..02b9f0a2b6a38309e22f6a4a4d55001c8fea5640 100644 (file)
--- a/Cython/Compiler/Builtin.py
+++ b/Cython/Compiler/Builtin.py
@@ -169,7 +169,14 @@ py23_set_utility_code = ["""
     ((ob)->ob_type == ((PyTypeObject*)&PySet_Type) || \
      (ob)->ob_type == ((PyTypeObject*)&PyFrozenSet_Type))
 
-#define PySet_Pop(set) PyObject_CallMethod(set, "pop", NULL)
+#define PySet_New(iterable) \
+    PyObject_CallFunctionObjArgs((PyObject *)PySet_Type, iterable, NULL)
+#define Pyx_PyFrozenSet_New(iterable) \
+    PyObject_CallFunctionObjArgs((PyObject *)PyFrozenSet_Type, iterable, NULL)
+
+#define PySet_Size(anyset)          PyObject_Size(anyset)
+#define PySet_Contains(anyset, key) PySequence_Contains(anyset, key)
+#define PySet_Pop(set)              PyObject_CallMethod(set, "pop", NULL)
 
 static INLINE int PySet_Clear(PyObject *set) {
     PyObject *ret = PyObject_CallMethod(set, "clear", NULL);
@@ -205,14 +212,6 @@ static PyTypeObject *PyFrozenSet_Type = NULL;
 
 #define PyFrozenSet_CheckExact(ob) ((ob)->ob_type == &PyFrozenSet_Type)
 
-#define PySet_New(iterable) \
-    PyObject_CallFunctionObjArgs((PyObject *)PySet_Type, iterable, NULL)
-#define Pyx_PyFrozenSet_New(iterable) \
-    PyObject_CallFunctionObjArgs((PyObject *)PyFrozenSet_Type, iterable, NULL)
-
-#define PySet_Size(anyset)          PyObject_Size(anyset)
-#define PySet_Contains(anyset, key) PySequence_Contains(anyset, key)
-
 /* ---------------------------------------------------------------- */
 
 static int __Pyx_Py23SetsImport(void) {