summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-06-25 12:29:30 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-06-25 12:29:30 +0100
commite7503d188a4d9e3c9c827f16e85580cdd239ef55 (patch)
tree2182c4299faa0508fd2f0e36780eb2475b92059f
parente632ceab0acc280bf1163dcde1853495599868e2 (diff)
downloaddbus-e7503d188a4d9e3c9c827f16e85580cdd239ef55.tar.gz
_dbus_message_iter_check: compile non-dummy version if asserting, too
-rw-r--r--dbus/dbus-message.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 01dcaa8e..3f97ef28 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -729,7 +729,7 @@ dbus_message_cache_or_finalize (DBusMessage *message)
dbus_message_finalize (message);
}
-#ifndef DBUS_DISABLE_CHECKS
+#if defined(DBUS_ENABLE_CHECKS) || defined(DBUS_ENABLE_ASSERT)
static dbus_bool_t
_dbus_message_iter_check (DBusMessageRealIter *iter)
{
@@ -777,13 +777,7 @@ _dbus_message_iter_check (DBusMessageRealIter *iter)
return TRUE;
}
-#else
-static dbus_bool_t
-_dbus_message_iter_check (DBusMessageRealIter *iter)
-{
- return TRUE;
-}
-#endif /* DBUS_DISABLE_CHECKS */
+#endif /* DBUS_ENABLE_CHECKS || DBUS_ENABLE_ASSERT */
/**
* Implementation of the varargs arg-getting functions.