diff options
| author | Chengwei Yang <chengwei.yang@intel.com> | 2013-06-25 11:34:11 +0800 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-25 12:26:04 +0100 |
| commit | 2fe0e999347e7e665ac21c2c53c026d53cd9a163 (patch) | |
| tree | 71ef48ef804d6063a09b405c8c9aa4cfec9e7e16 /dbus | |
| parent | 7038cdc249a96e9f8ada207105ff72ba63c1dfa4 (diff) | |
| download | dbus-2fe0e999347e7e665ac21c2c53c026d53cd9a163.tar.gz | |
Fix build failure if build with checks but without asserts
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65990
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-connection.c | 6 | ||||
| -rw-r--r-- | dbus/dbus-message.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 5c732e23..efc1cfbd 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -336,8 +336,8 @@ struct DBusConnection #ifndef DBUS_DISABLE_CHECKS unsigned int have_connection_lock : 1; /**< Used to check locking */ #endif - -#ifndef DBUS_DISABLE_CHECKS + +#if !defined(DBUS_DISABLE_CHECKS) || !defined(DBUS_DISABLE_ASSERT) int generation; /**< _dbus_current_generation that should correspond to this connection */ #endif }; @@ -1354,7 +1354,7 @@ _dbus_connection_new_for_transport (DBusTransport *transport) connection->disconnected_message_arrived = FALSE; connection->disconnected_message_processed = FALSE; -#ifndef DBUS_DISABLE_CHECKS +#if !defined(DBUS_DISABLE_CHECKS) || !defined(DBUS_DISABLE_ASSERT) connection->generation = _dbus_current_generation; #endif diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 696991f6..01dcaa8e 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -777,6 +777,12 @@ _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 */ /** |