Merge branch 'trunk' into xwidget

Conflicts:
	src/xdisp.c

1 files changed, 6 insertions, 2 deletions

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 3ec3c28431b..523544d56ca 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -142,7 +142,10 @@ static bool xd_in_read_queued_messages = 0;
   } while (0)
 
 #else /* !DBUS_DEBUG */
-#define XD_DEBUG_MESSAGE(...)                                           \
+# if __STDC_VERSION__ < 199901
+#  define XD_DEBUG_MESSAGE (void) /* Pre-C99 compilers cannot debug.  */
+# else
+#  define XD_DEBUG_MESSAGE(...)                                         \
   do {                                                                  \
     if (!NILP (Vdbus_debug))                                            \
       {                                                                 \
@@ -151,7 +154,8 @@ static bool xd_in_read_queued_messages = 0;
         message ("%s: %s", __func__, s);                                \
       }                                                                 \
   } while (0)
-#define XD_DEBUG_VALID_LISP_OBJECT_P(object)
+# endif
+# define XD_DEBUG_VALID_LISP_OBJECT_P(object)
 #endif
 
 /* Check whether TYPE is a basic DBusType.  */