From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29473 invoked by alias); 5 Mar 2009 21:53:57 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 29434 invoked by uid 9674); 5 Mar 2009 21:53:57 -0000 Date: Thu, 05 Mar 2009 21:53:00 -0000 Message-ID: <20090305215357.29419.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-python: Merge commit 'origin/archer-tromey-python' into archer-jankratochvil-python X-Git-Refname: refs/heads/archer-jankratochvil-python X-Git-Reftype: branch X-Git-Oldrev: a0d288848d0d1ae00798d5f5a86ee8d48ea8f87c X-Git-Newrev: b4c50b1c09c24b8796dbc6c5d82572029472c014 X-SW-Source: 2009-q1/txt/msg00270.txt.bz2 List-Id: The branch, archer-jankratochvil-python has been updated via b4c50b1c09c24b8796dbc6c5d82572029472c014 (commit) via 5d73409799981c07fba0c15494f53285bb662437 (commit) from a0d288848d0d1ae00798d5f5a86ee8d48ea8f87c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: gdb/python/python-function.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) First 500 lines of diff: diff --git a/gdb/python/python-function.c b/gdb/python/python-function.c index 608ac28..4a85a33 100644 --- a/gdb/python/python-function.c +++ b/gdb/python/python-function.c @@ -93,7 +93,7 @@ fnpy_call (void *cookie, int argc, struct value **argv) Py_DECREF (result); do_cleanups (cleanup); - + return value; } @@ -127,10 +127,9 @@ fnpy_init (PyObject *self, PyObject *args, PyObject *kwds) void gdbpy_initialize_functions (void) { - fnpy_object_type.tp_new = PyType_GenericNew; - fnpy_object_type.tp_init = fnpy_init; if (PyType_Ready (&fnpy_object_type) < 0) return; + Py_INCREF (&fnpy_object_type); PyModule_AddObject (gdb_module, "Function", (PyObject *) &fnpy_object_type); } @@ -167,5 +166,15 @@ static PyTypeObject fnpy_object_type = 0, /* tp_weaklistoffset */ 0, /* tp_iter */ 0, /* tp_iternext */ - 0 /* tp_methods */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + fnpy_init, /* tp_init */ + 0, /* tp_alloc */ + PyType_GenericNew /* tp_new */ }; hooks/post-receive -- Repository for Project Archer.