From: John (J5) Palmieri <johnp@redhat.com>
Date: Tue, 15 Jan 2008 23:10:50 +0000 (-0500)
Subject: wrap all_reader_classes[] in #ifndef DBUS_DISABLE_ASSERT (FDO Bug #9030)
X-Git-Tag: dbus-1.1.3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e113a70b567eb413ce43ca79f2be56b08c41516f;p=thirdparty%2Fdbus.git

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 528d74b15..9375a888c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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>
diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c
index 400eda1a3..6c2902e24 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.