diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2008-01-15 18:10:50 -0500 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2008-01-15 18:10:50 -0500 |
| commit | e113a70b567eb413ce43ca79f2be56b08c41516f (patch) | |
| tree | 3d0b006a1f4e5c70b98811df0d4ed3db4d7e8be1 | |
| parent | 7ef60319c7d7c296f555e034b007c2729fd25853 (diff) | |
wrap all_reader_classes[] in #ifndef DBUS_DISABLE_ASSERT (FDO Bug #9030)
2008-01-15 John (J5) Palmieri <johnp@redhat.com>
* patch by Sébastien Couret <10function at gmail dot com>
* dbus/dbus-marshal-recursive.c (all_reader_classes[]): wrap in
#ifndef DBUS_DISABLE_ASSERT since it is only used in asserts which
are noop
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dbus/dbus-marshal-recursive.c | 2 |
2 files changed, 10 insertions, 0 deletions
@@ -1,5 +1,13 @@ 2008-01-15 John (J5) Palmieri <johnp@redhat.com> + * patch by Sébastien Couret <10function at gmail dot com> + + * dbus/dbus-marshal-recursive.c (all_reader_classes[]): wrap in + #ifndef DBUS_DISABLE_ASSERT since it is only used in asserts which + are noop + +2008-01-15 John (J5) Palmieri <johnp@redhat.com> + * patch by Magnus Henoch <henoch plus bfdo at dtek dot chalmers dot se> * dbus/dbus-auth.c (handle_server_data_external_mech): handle SASL diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c index 400eda1a..6c2902e2 100644 --- a/dbus/dbus-marshal-recursive.c +++ b/dbus/dbus-marshal-recursive.c @@ -690,6 +690,7 @@ static const DBusTypeReaderClass variant_reader_class = { base_reader_next }; +#ifndef DBUS_DISABLE_ASSERT static const DBusTypeReaderClass * const all_reader_classes[] = { &body_reader_class, @@ -702,6 +703,7 @@ all_reader_classes[] = { &array_types_only_reader_class, &variant_reader_class }; +#endif /** * Initializes a type reader. |