From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 25 Jun 2013 11:29:30 +0000 (+0100)
Subject: _dbus_message_iter_check: compile non-dummy version if asserting, too
X-Git-Tag: dbus-1.7.6~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7503d188a4d9e3c9c827f16e85580cdd239ef55;p=thirdparty%2Fdbus.git

_dbus_message_iter_check: compile non-dummy version if asserting, too
---

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 01dcaa8e7..3f97ef28a 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.