From e113a70b567eb413ce43ca79f2be56b08c41516f Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 15 Jan 2008 18:10:50 -0500 Subject: wrap all_reader_classes[] in #ifndef DBUS_DISABLE_ASSERT (FDO Bug #9030) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-01-15 John (J5) Palmieri * 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 --- ChangeLog | 8 ++++++++ dbus/dbus-marshal-recursive.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 528d74b1..9375a888 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-15 John (J5) Palmieri + + * 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 * patch by Magnus Henoch 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. -- cgit