diff options
| author | Paul Eggert <[email protected]> | 2012-04-22 10:46:49 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2012-04-22 10:46:49 -0700 |
| commit | de85e130f59b5164e2150abda92316f3a07d82c0 (patch) | |
| tree | cdc3f38ad60518f5ea8f2243c7ff62e1e1fbc302 /src | |
| parent | dcbf5805ac7ade7fc83f3d209e2d56f029918402 (diff) | |
* dbusbind.c (XD_DBUS_VALIDATE_OBJECT): Define only if needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/dbusbind.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 205728f91d..0d557fcc1c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-04-22 Paul Eggert <[email protected]> + + * dbusbind.c (XD_DBUS_VALIDATE_OBJECT): Define only if needed. + 2012-04-22 Michael Albinus <[email protected]> Move functions from C to Lisp. Make non-blocking method calls diff --git a/src/dbusbind.c b/src/dbusbind.c index 78e5c80baf..0ea08d7bf0 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -291,6 +291,8 @@ xd_symbol_to_dbus_type (Lisp_Object object) } \ } while (0) +#if (HAVE_DBUS_VALIDATE_BUS_NAME || HAVE_DBUS_VALIDATE_PATH \ + || XD_DBUS_VALIDATE_OBJECT || HAVE_DBUS_VALIDATE_MEMBER) #define XD_DBUS_VALIDATE_OBJECT(object, func) \ do { \ if (!NILP (object)) \ @@ -304,6 +306,7 @@ xd_symbol_to_dbus_type (Lisp_Object object) dbus_error_free (&derror); \ } \ } while (0) +#endif #if HAVE_DBUS_VALIDATE_BUS_NAME #define XD_DBUS_VALIDATE_BUS_NAME(bus_name) \ @@ -864,7 +867,7 @@ static int xd_get_connection_references (DBusConnection *connection) { ptrdiff_t *refcount; - + /* We cannot access the DBusConnection structure, it is not public. But we know, that the reference counter is the first field in that structure. */ |