From 44a872dd519edb104e1354cac6adac71bb931262 Mon Sep 17 00:00:00 2001
From: John Ehresman <jpe@wingware.com>
Date: Sat, 17 Apr 2010 17:49:03 -0400
Subject: [PATCH] Forgotten Py_TYPE & PyVarObject changes

---
 src/font.c    | 5 ++---
 src/surface.c | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/font.c b/src/font.c
index 25eb646..4c172f6 100644
--- 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
index 2501c90..88725a5 100644
--- 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 */