[Emacs-diffs] scratch/dbusbind-type-tests 7778488 1/2: dbusbind: Avoid redefinition of :signature symbol

[Daiki Ueno]

branch: scratch/dbusbind-type-tests
commit 777848833cc9ff40411b78ad107e755172a881b8
Author: Daiki Ueno <address@hidden>
Commit: Daiki Ueno <address@hidden>

    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 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 079a0b0..9747d88 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'.  */