procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* dbusbind.c (XD_DBUS_VALIDATE_OBJECT): Define only if needed.

Browse source
This commit is contained in:
Paul Eggert 2012-04-22 10:46:49 -07:00
parent dcbf5805ac
commit de85e130f5
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-04-22 Paul Eggert <eggert@cs.ucla.edu>
* dbusbind.c (XD_DBUS_VALIDATE_OBJECT): Define only if needed.
2012-04-22 Michael Albinus <michael.albinus@gmx.de>
Move functions from C to Lisp. Make non-blocking method calls

5
src/dbusbind.c
View file

@ -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. */