[SCM] archer: Merge commit 'origin/archer-jankratochvil-python' into archer

[jkratoch@sourceware.org]

The branch, archer has been updated
       via  337f0763307e136ea5897beddc64d0cf75eb85f6 (commit)
       via  b4c50b1c09c24b8796dbc6c5d82572029472c014 (commit)
       via  5d73409799981c07fba0c15494f53285bb662437 (commit)
      from  a02ff1c049b55fae6e887eb4130e82aba3b4f897 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 337f0763307e136ea5897beddc64d0cf75eb85f6
Merge: a02ff1c049b55fae6e887eb4130e82aba3b4f897 b4c50b1c09c24b8796dbc6c5d82572029472c014
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Mar 5 22:53:15 2009 +0100

    Merge commit 'origin/archer-jankratochvil-python' into archer

-----------------------------------------------------------------------

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.