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

diff --git a/src/ChangeLog b/src/ChangeLog
index 205728f91da1218bcb444406abd73f5b4ab627c9..0d557fcc1cf9cc78d23b9d6cc9879f54d4ccce32 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 78e5c80baf371bf35130c679ba16fa00af15f4dc..0ea08d7bf0e817d9daff39903b7135a7f22e339b 100644 (file)
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -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.  */