summaryrefslogtreecommitdiff
path: root/dbus
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-21 14:52:49 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-21 14:52:49 +0000
commit13c1292150c4f5d57527d11f5b92f5b955f9906e (patch)
tree00ac8cfd3cc33c7b3e8565ac5f2482524fe666f9 /dbus
parenta6ee0757ecb121514480c69ffa52b665903e4f26 (diff)
downloaddbus-13c1292150c4f5d57527d11f5b92f5b955f9906e.tar.gz
Turn the non-valgrind code path into inline functions to avoid compiler warnings
Recent gcc will warn if you have a statement that's just a macro expanding to (0), but not if you have an inline stub function that always returns 0, so let's do the latter. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37286 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-valgrind-internal.h26
1 files changed, 23 insertions, 3 deletions
diff --git a/dbus/dbus-valgrind-internal.h b/dbus/dbus-valgrind-internal.h
index 4c972c59..55566ec0 100644
--- a/dbus/dbus-valgrind-internal.h
+++ b/dbus/dbus-valgrind-internal.h
@@ -36,10 +36,30 @@
# define VALGRIND_DESTROY_MEMPOOL(_1) /* nothing */
# define VALGRIND_MEMPOOL_ALLOC(_1, _2, _3) /* nothing */
# define VALGRIND_MEMPOOL_FREE(_1, _2) /* nothing */
-# define VALGRIND_MAKE_MEM_UNDEFINED(_1, _2) (0)
-# define VALGRIND_PRINTF(...) (0)
-# define VALGRIND_PRINTF_BACKTRACE(...) (0)
+/* Recent gcc will warn if you have a statement that's just a macro
+ * expanding to (0), but not if you have an inline stub function that
+ * always returns 0, so let's do the latter. */
+static inline int
+VALGRIND_MAKE_MEM_UNDEFINED (void *addr,
+ size_t len)
+{
+ return 0;
+}
+
+static inline int
+VALGRIND_PRINTF (const char *format,
+ ...)
+{
+ return 0;
+}
+
+static inline int
+VALGRIND_PRINTF_BACKTRACE (const char *format,
+ ...)
+{
+ return 0;
+}
# define RUNNING_ON_VALGRIND 0
#endif /* WITH_VALGRIND */