[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107996: * dbusbind.c (XD_DBUS_VALIDATE_OBJECT): Define only if needed.

[Paul Eggert]

------------------------------------------------------------
revno: 107996
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-22 10:46:49 -0700
message:
  * dbusbind.c (XD_DBUS_VALIDATE_OBJECT): Define only if needed.
modified:
  src/ChangeLog
  src/dbusbind.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-22 14:11:43 +0000
+++ b/src/ChangeLog     2012-04-22 17:46:49 +0000
@@ -1,3 +1,7 @@
+2012-04-22  Paul Eggert  <address@hidden>
+
+       * dbusbind.c (XD_DBUS_VALIDATE_OBJECT): Define only if needed.
+
 2012-04-22  Michael Albinus  <address@hidden>
 
        Move functions from C to Lisp.  Make non-blocking method calls

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2012-04-22 14:11:43 +0000
+++ b/src/dbusbind.c    2012-04-22 17:46:49 +0000
@@ -291,6 +291,8 @@
       }                                                                        
\
   } 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 @@
        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 @@
 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.  */