summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2006-12-18 12:03:27 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2006-12-18 12:03:27 +0000
commit358403cd0cba20ccda4961a39644c092a0f05b74 (patch)
treeb15809f59616a487df2d3564f592dc8db57bf240 /include
parentf4bb2ca522a39fbbf2cce536410c973a73b9059c (diff)
downloaddbus-python-358403cd0cba20ccda4961a39644c092a0f05b74.tar.gz
include/dbus_bindings.h: Rename to include/dbus-python.h, improve namespacing.
_dbus_bindings/conn-internal.h, _dbus_bindings/dbus_bindings-internal.h, _dbus_glib_bindings/module.c: Use dbus-python.h instead of dbus_bindings.h
Diffstat (limited to 'include')
-rw-r--r--include/dbus-python.h (renamed from include/dbus_bindings.h)6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/dbus_bindings.h b/include/dbus-python.h
index bd1ee55..9d6d581 100644
--- a/include/dbus_bindings.h
+++ b/include/dbus-python.h
@@ -33,7 +33,7 @@ DBUS_BEGIN_DECLS
#define DBUS_BINDINGS_API_COUNT 3
-#ifdef INSIDE_DBUS_BINDINGS
+#ifdef INSIDE_DBUS_PYTHON_BINDINGS
#define Connection_BorrowDBusConnection DBusPyConnection_BorrowDBusConnection
#define NativeMainLoop_New4 DBusPyNativeMainLoop_New4
@@ -48,9 +48,9 @@ extern PyObject *DBusPyNativeMainLoop_New4(dbus_bool_t (*)(DBusConnection *, voi
static PyObject *_dbus_bindings_module = NULL;
static void **dbus_bindings_API;
-#define Connection_BorrowDBusConnection \
+#define DBusPyConnection_BorrowDBusConnection \
(*(DBusConnection *(*)(PyObject *))dbus_bindings_API[1])
-#define NativeMainLoop_New4 \
+#define DBusPyNativeMainLoop_New4 \
((PyObject *(*)(dbus_bool_t (*)(DBusConnection *, void *),\
dbus_bool_t (*)(DBusServer *, void *),\
void (*)(void *),\