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

diff --git a/ChangeLog b/ChangeLog
index 528d74b..9375a88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 400eda1..6c2902e 100644 (file)
--- 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.