Revert my earlier change, see #440544.

svn path=/trunk/; revision=5680

diff --git a/ChangeLog b/ChangeLog
index da91adb..4bdc33b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-2007-08-06  Tor Lillqvist  <tml@novell.com>
-
-       * glib/gslice.c: Move the G_ENABLE_DEBUG ifdef inside
-       g_slice_debug_tree_statistics() so that the function exists (but
-       doesn't do anything) also in a non-debug build. (#440544)
-
 2007-08-03  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/glib/gslice.c b/glib/gslice.c
index 360ccae..66ed898 100644 (file)
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -1410,10 +1410,10 @@ smc_tree_remove (SmcKType key)
   return found_one;
 }
 
+#ifdef G_ENABLE_DEBUG
 void
 g_slice_debug_tree_statistics (void)
 {
-#ifdef G_ENABLE_DEBUG
   g_mutex_lock (smc_tree_mutex);
   if (smc_tree_root)
     {
@@ -1469,8 +1469,8 @@ g_slice_debug_tree_statistics (void)
    * GSlice: MemChecker: 504.900474 branches per trunk, 98.81% utilization
    * GSlice: MemChecker: 4.965039 entries per branch, 1 minimum, 37 maximum
    */
-#endif /* G_ENABLE_DEBUG */
 }
+#endif /* G_ENABLE_DEBUG */
 
 #define __G_SLICE_C__
 #include "galiasdef.c"