General: Update for Python 2.5.

[pyke] / util.c

diff --git a/util.c b/util.c
index 1739ebe9b4a2d4a78685b25b9d563a3227cfa0e5..72014015b9878232b10493d608b51219f4098233 100644 (file)
--- a/util.c
+++ b/util.c
@@ -145,13 +145,13 @@ void *newtype(PyTypeObject *metaty,
     (PyHeapTypeObject *)_PyObject_GC_Malloc(_PyObject_VAR_SIZE(metaty, 0));
   if (!skel) skel = &emptytype;
   memcpy(ty, skel, sizeof(*skel));
     (PyHeapTypeObject *)_PyObject_GC_Malloc(_PyObject_VAR_SIZE(metaty, 0));
   if (!skel) skel = &emptytype;
   memcpy(ty, skel, sizeof(*skel));

-  if (ty->type.tp_base) Py_INCREF(ty->type.tp_base);
+  if (ty->ht_type.tp_base) Py_INCREF(ty->ht_type.tp_base);

 #define COPY(blah) do {                                                        \
 #define COPY(blah) do {                                                        \

-    if (ty->type.tp_as_##blah) {                                       \
+    if (ty->ht_type.tp_as_##blah) {                                    \

       memcpy(&ty->as_##blah,                                           \
       memcpy(&ty->as_##blah,                                           \

-            ty->type.tp_as_##blah,                                     \
+            ty->ht_type.tp_as_##blah,                                  \

             sizeof(ty->as_##blah));                                    \
             sizeof(ty->as_##blah));                                    \

-      ty->type.tp_as_##blah = &ty->as_##blah;                          \
+      ty->ht_type.tp_as_##blah = &ty->as_##blah;                       \

     }                                                                  \
   } while (0)
   COPY(number);
     }                                                                  \
   } while (0)
   COPY(number);


@@ -160,12 +160,12 @@ void *newtype(PyTypeObject *metaty,
   COPY(buffer);
 #undef COPY
   if (name)
   COPY(buffer);
 #undef COPY
   if (name)

-    ty->name = PyString_FromString(name);
-  else if (ty->type.tp_name)
-    ty->name = PyString_FromString(ty->type.tp_name);
-  if (ty->name)
-    ty->type.tp_name = PyString_AS_STRING(ty->name);
-  PyObject_INIT(&ty->type, metaty);
+    ty->ht_name = PyString_FromString(name);
+  else if (ty->ht_type.tp_name)
+    ty->ht_name = PyString_FromString(ty->ht_type.tp_name);
+  if (ty->ht_name)
+    ty->ht_type.tp_name = PyString_AS_STRING(ty->ht_name);
+  PyObject_INIT(&ty->ht_type, metaty);

   Py_INCREF(metaty);
   return (ty);
 }
   Py_INCREF(metaty);
   return (ty);
 }