glib r6778 - in branches/glib-2-16: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Mar 31 04:46:32 2008
New Revision: 6778
URL: http://svn.gnome.org/viewvc/glib?rev=6778&view=rev

Log:
2008-03-30  Matthias Clasen  <mclasen redhat com>

        * glib/ghash.c: Fix the build with -DG_DISABLE_ASSERT.
        (#525060, Arfrever Frehtes Taifersar Arahesis)


Modified:
   branches/glib-2-16/ChangeLog
   branches/glib-2-16/glib/ghash.c

Modified: branches/glib-2-16/glib/ghash.c
==============================================================================
--- branches/glib-2-16/glib/ghash.c	(original)
+++ branches/glib-2-16/glib/ghash.c	Mon Mar 31 04:46:32 2008
@@ -422,7 +422,9 @@
   RealIter *ri = (RealIter *) iter;
 
   g_return_val_if_fail (iter != NULL, FALSE);
+#ifndef G_DISABLE_ASSERT
   g_return_val_if_fail (ri->version == ri->hash_table->version, FALSE);
+#endif
 
   if (ri->pre_advanced)
     {
@@ -484,7 +486,9 @@
   int position;
 
   g_return_if_fail (ri != NULL);
+#ifndef G_DISABLE_ASSERT
   g_return_if_fail (ri->version == ri->hash_table->version);
+#endif
   g_return_if_fail (ri->node != NULL);
 
   prev = ri->prev_node;