include missing #ifdef G_ENA\BLE_DEBUG

Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENA\BLE_DEBUG

diff --git a/ChangeLog b/ChangeLog
index deef087a64406f3395dda6c995b1352b78eaab25..df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
+
 Thu May 16 15:44:15 2002  Owen Taylor  <otaylor@redhat.com>
 
         * demos/gtk-demo/editable_cells.c (cell_edited): Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index deef087a64406f3395dda6c995b1352b78eaab25..df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
+
 Thu May 16 15:44:15 2002  Owen Taylor  <otaylor@redhat.com>
 
         * demos/gtk-demo/editable_cells.c (cell_edited): Fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index deef087a64406f3395dda6c995b1352b78eaab25..df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
+
 Thu May 16 15:44:15 2002  Owen Taylor  <otaylor@redhat.com>
 
         * demos/gtk-demo/editable_cells.c (cell_edited): Fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index deef087a64406f3395dda6c995b1352b78eaab25..df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
+
 Thu May 16 15:44:15 2002  Owen Taylor  <otaylor@redhat.com>
 
         * demos/gtk-demo/editable_cells.c (cell_edited): Fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index deef087a64406f3395dda6c995b1352b78eaab25..df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
+
 Thu May 16 15:44:15 2002  Owen Taylor  <otaylor@redhat.com>
 
         * demos/gtk-demo/editable_cells.c (cell_edited): Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index deef087a64406f3395dda6c995b1352b78eaab25..df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
+
 Thu May 16 15:44:15 2002  Owen Taylor  <otaylor@redhat.com>
 
         * demos/gtk-demo/editable_cells.c (cell_edited): Fix

diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c
index 0a426f05576ed1d8881da02dc4a9bbceca341a61..85daab4ab5ea30c90d95fafb3013fed18461455d 100644 (file)
--- a/gtk/gtkrbtree.c
+++ b/gtk/gtkrbtree.c
@@ -482,8 +482,10 @@ _gtk_rbtree_remove (GtkRBTree *tree)
 
   gint height = tree->root->offset;
 
+#ifdef G_ENABLE_DEBUG  
   if (gtk_debug_flags & GTK_DEBUG_TREE)
     _gtk_rbtree_test (G_STRLOC, tree);
+#endif
   
   tmp_tree = tree->parent_tree;
   tmp_node = tree->parent_node;
@@ -513,8 +515,10 @@ _gtk_rbtree_remove (GtkRBTree *tree)
   tmp_node = tree->parent_node;
   _gtk_rbtree_free (tree);
 
+#ifdef G_ENABLE_DEBUG  
   if (gtk_debug_flags & GTK_DEBUG_TREE)
     _gtk_rbtree_test (G_STRLOC, tmp_tree);
+#endif
 }
 
 
@@ -733,8 +737,10 @@ _gtk_rbtree_node_set_height (GtkRBTree *tree,
          tmp_tree = tmp_tree->parent_tree;
        }
     }
+#ifdef G_ENABLE_DEBUG  
   if (gtk_debug_flags & GTK_DEBUG_TREE)
     _gtk_rbtree_test (G_STRLOC, tree);
+#endif
 }
 
 void
@@ -1219,9 +1225,11 @@ _gtk_rbtree_remove_node (GtkRBTree *tree,
     ;
   g_return_if_fail (x == tree->root);
 
+#ifdef G_ENABLE_DEBUG  
   if (gtk_debug_flags & GTK_DEBUG_TREE)
     _gtk_rbtree_test (G_STRLOC, tree);
-
+#endif
+  
   if (node->left == tree->nil || node->right == tree->nil)
     {
       y = node;

diff --git a/gtk/gtkrbtree.h b/gtk/gtkrbtree.h
index c5b4768db6c4a222595f89db777e84cd6e367399..bf149836ddf8e357abb524a988dd95495769a425 100644 (file)
--- a/gtk/gtkrbtree.h
+++ b/gtk/gtkrbtree.h
@@ -171,10 +171,11 @@ void       _gtk_rbtree_prev_full        (GtkRBTree              *tree,
 gint       _gtk_rbtree_get_depth        (GtkRBTree              *tree);
 
 /* This func checks the integrity of the tree */
+#ifdef G_ENABLE_DEBUG  
 void       _gtk_rbtree_test             (const gchar            *where,
                                          GtkRBTree              *tree);
 void       _gtk_rbtree_debug_spew       (GtkRBTree              *tree);
-
+#endif
 
 #ifdef __cplusplus
 }