_dbus_message_iter_append_check: Fix ifdef check

With internal DBus checks disabled, but with assertions enabled, the
function would be ifdef'ed out. This is problematic, since the function
is called from within an assertion statement in _dbus_variant_write().

Fixes #412.

Co-authored-by: Simon McVittie <smcv@collabora.com>

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 19a4375093293446b5598a57867041b5d6d01011..a87043e38a8ec046d713520df45d0fbe4cfa5be3 100644 (file)
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -2675,7 +2675,7 @@ _dbus_message_iter_abandon_signature (DBusMessageRealIter *real)
   dbus_free (str);
 }
 
-#ifndef DBUS_DISABLE_CHECKS
+#if defined(DBUS_ENABLE_CHECKS) || defined(DBUS_ENABLE_ASSERT)
 static dbus_bool_t
 _dbus_message_iter_append_check (DBusMessageRealIter *iter)
 {
@@ -2690,7 +2690,7 @@ _dbus_message_iter_append_check (DBusMessageRealIter *iter)
 
   return TRUE;
 }
-#endif /* DBUS_DISABLE_CHECKS */
+#endif
 
 #ifdef HAVE_UNIX_FD_PASSING
 static int *