1 files changed, 6 insertions, 2 deletions

diff --git a/src/dbusbind.c b/src/dbusbind.c
index fa26f9e4168..54b0217799d 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -233,8 +233,12 @@ xd_symbol_to_dbus_type (Lisp_Object object)
 
 /* Transform the object to its string representation for debug
    messages.  */
-#define XD_OBJECT_TO_STRING(object)                                     \
-  SDATA (format2 ("%s", object, Qnil))
+static char *
+XD_OBJECT_TO_STRING (Lisp_Object object)
+{
+  AUTO_STRING (format, "%s");
+  return SSDATA (CALLN (Fformat, format, object));
+}
 
 #define XD_DBUS_VALIDATE_BUS_ADDRESS(bus)                               \
   do {                                                                  \