Forgotten Py_TYPE & PyVarObject changes

jpe · Apr 17, 2010 · 44a872d · 44a872d
1 parent a29f161
commit 44a872d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/font.c b/src/font.c
@@ -204,8 +204,7 @@ static PyMethodDef toy_font_face_methods[] = {
 
 
 PyTypeObject PycairoToyFontFace_Type = {
-  PyObject_HEAD_INIT(NULL)
-  0,                                  /* ob_size */
+  PyVarObject_HEAD_INIT(NULL, 0)
   "cairo.ToyFontFace",                /* tp_name */
   sizeof(PycairoToyFontFace),         /* tp_basicsize */
   0,                                  /* tp_itemsize */
@@ -282,7 +281,7 @@ scaled_font_dealloc(PycairoScaledFont *o) {
     cairo_scaled_font_destroy (o->scaled_font);
     o->scaled_font = NULL;
   }
-  o->ob_type->tp_free((PyObject *) o);
+  Py_TYPE(o)->tp_free((PyObject *) o);
 }
 
 static PyObject *

diff --git a/src/surface.c b/src/surface.c
@@ -339,8 +339,7 @@ static PyMethodDef surface_methods[] = {
 
 
 PyTypeObject PycairoSurface_Type = {
-  PyObject_HEAD_INIT(NULL)
-  0,                                  /* ob_size */
+  PyVarObject_HEAD_INIT(NULL, 0)
   "cairo.Surface",                    /* tp_name */
   sizeof(PycairoSurface),             /* tp_basicsize */
   0,                                  /* tp_itemsize */