Created attachment 68494 [details] [review]
0001-Fix-building-with-newer-Valgrind.patch

Comment on attachment 68494 [details] [review]
0001-Fix-building-with-newer-Valgrind.patch

Review of attachment 68494 [details] [review]:
-----------------------------------------------------------------

Looks fine to me, other committers are welcome to commit this (or I'll get round to it myself sooner or later).

::: dbus/dbus-valgrind-internal.h
@@ +34,5 @@
>  #else
> +#   define VALGRIND_CREATE_MEMPOOL(_1, _2, _3) do { } while (0) /* nothing */
> +#   define VALGRIND_DESTROY_MEMPOOL(_1) do { } while (0) /* nothing */
> +#   define VALGRIND_MEMPOOL_ALLOC(_1, _2, _3) do { } while (0) /* nothing */
> +#   define VALGRIND_MEMPOOL_FREE(_1, _2) do { } while (0) /* nothing */

Now that the macro has a non-empty expansion, the trailing "/* nothing */" no longer adds anything, and can be removed.

Fixed in git for 1.6.10, 1.7.0