From 777848833cc9ff40411b78ad107e755172a881b8 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 3 Sep 2015 17:53:58 +0900 Subject: [PATCH] dbusbind: Avoid redefinition of :signature symbol * src/dbusbind.c (syms_of_dbusbind): Don't redefine `:signature' symbol. (xd_dbus_message_to_lisp): Temporarily map QCdbus_message_signature to QCdbus_type_signature. --- src/dbusbind.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dbusbind.c b/src/dbusbind.c index 079a0b02f14..9747d88a5a9 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1821,6 +1821,9 @@ xd_dbus_message_to_lisp (DBusMessage *dmessage) XD_ADD_HEADER (member); XD_ADD_HEADER (destination); XD_ADD_HEADER (sender); + + /* Don't redefine `:signature'. */ +#define QCdbus_message_signature QCdbus_type_signature XD_ADD_HEADER (signature); #undef XD_ADD_HEADER @@ -2141,7 +2144,6 @@ syms_of_dbusbind (void) DEFSYM (QCdbus_message_member, ":member"); DEFSYM (QCdbus_message_destination, ":destination"); DEFSYM (QCdbus_message_sender, ":sender"); - DEFSYM (QCdbus_message_signature, ":signature"); DEFSYM (QCdbus_message_args, ":args"); /* Lisp symbols of objects in `dbus-registered-objects-table'. */ -- 2.39.5