From d2f53eb32409ea9dbf654febc7853badc81a8e4b Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@gnome.org>
Date: Sat, 26 Jul 2008 14:46:58 +0000
Subject: reviewed by: <delete if not using a buddy>

2008-07-26  Johan Dahlin  <johan@gnome.org>

    reviewed by: <delete if not using a buddy>

    * glib/pyglib-python-compat.h:
    * glib/pyglib.h:
    Make a few macros public

    * gobject/Makefile.am:
    * gobject/gobjectmodule.c (init_gobject):
    * gobject/pyginterface.c (pyg_interface_init),
    (pyg_interface_free), (pyg_register_interface),
    (pyg_register_interface_info), (pyg_lookup_interface_info),
    (pygobject_interface_register_types):
    * gobject/pyginterface.h:
    * gobject/pygobject-private.h:
    * gobject/pygobject.c:
    Move GInterface wrapper into its own file


svn path=/trunk/; revision=875
---
 glib/pyglib-python-compat.h | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'glib/pyglib-python-compat.h')

diff --git a/glib/pyglib-python-compat.h b/glib/pyglib-python-compat.h
index b7a1970..4f062f4 100644
--- a/glib/pyglib-python-compat.h
+++ b/glib/pyglib-python-compat.h
@@ -28,27 +28,6 @@ typedef int Py_ssize_t;
 
 /* Compilation on Python 2.x */
 #if PY_VERSION_HEX < 0x03000000
-#define PYGLIB_MODULE_START(symbol, modname)	        \
-DL_EXPORT(void) init##symbol(void)			\
-{                                                       \
-    PyObject *module;                                   \
-    module = Py_InitModule(modname, symbol##_functions);
-#define PYGLIB_MODULE_END }
-#define PYGLIB_DEFINE_TYPE(typename, symbol, csymbol)	\
-PyTypeObject symbol = {                                 \
-    PyObject_HEAD_INIT(NULL)                            \
-    0,                                                  \
-    typename,						\
-    sizeof(csymbol)                                     \
-};
-#define PYGLIB_REGISTER_TYPE(d, type, name)	        \
-    if (!type.tp_alloc)                                 \
-	type.tp_alloc = PyType_GenericAlloc;            \
-    if (!type.tp_new)                                   \
-	type.tp_new = PyType_GenericNew;                \
-    if (PyType_Ready(&type))                            \
-	return;                                         \
-    PyDict_SetItemString(d, name, (PyObject *)&type);
 
 #define _PyUnicode_Check PyString_Check 
 #define _PyUnicode_AsString PyString_AsString
@@ -66,6 +45,11 @@ PyTypeObject symbol = {                                 \
 #define _PyLongObject PyIntObject
 #define _PyLong_Type PyInt_Type
 #else
+#undef PYGLIB_MODULE_START
+#undef PYGLIB_MODULE_END
+#undef PYGLIB_DEFINE_TYPE
+#undef PYGLIB_REGISTER_TYPE
+
 #define PYGLIB_MODULE_START(symbol, modname)	        \
     static struct PyModuleDef _##symbol##module = {     \
     PyModuleDef_HEAD_INIT,                              \
-- 
cgit