* python/py-arch.c (arch_object_type): Use

[deliverable/binutils-gdb.git] / gdb / python / py-evtregistry.c

diff --git a/gdb/python/py-evtregistry.c b/gdb/python/py-evtregistry.c
index e1b4346c6b09df231e3da9b8d4902ab09eb92b6e..c8003af9af7d28d785a7105d81f6469e18b3bdf3 100644 (file)
--- a/gdb/python/py-evtregistry.c
+++ b/gdb/python/py-evtregistry.c
@@ -1,6 +1,6 @@
 /* Python interface to inferior thread event registries.
 
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,7 +21,10 @@
 #include "command.h"
 #include "py-events.h"
 
-static PyTypeObject eventregistry_object_type;
+events_object gdb_py_events;
+
+static PyTypeObject eventregistry_object_type
+    CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("eventregistry_object");
 
 /* Implementation of EventRegistry.connect () -> NULL.
    Add FUNCTION to the list of listeners.  */
@@ -95,7 +98,7 @@ static void
 evregpy_dealloc (PyObject *self)
 {
   Py_XDECREF (((eventregistry_object *) self)->callbacks);
-  self->ob_type->tp_free (self);
+  Py_TYPE (self)->tp_free (self);
 }
 
 /* Initialize the Python event registry code.  */
@@ -129,8 +132,7 @@ static PyMethodDef eventregistry_object_methods[] =
 
 static PyTypeObject eventregistry_object_type =
 {
-  PyObject_HEAD_INIT (NULL)
-  0,                                          /* ob_size */
+  PyVarObject_HEAD_INIT (NULL, 0)
   "gdb.EventRegistry",                        /* tp_name */
   sizeof (eventregistry_object),              /* tp_basicsize */
   0,                                          /* tp_itemsize */