Don't make ABI depend on G_ENABLE_DEBUG, just add an empty

2007-01-30  Matthias Clasen <mclasen@redhat.com>

        * glib/glib.symbols:
        * glib/gslice.h:
        * glib/gslice.c: Don't make ABI depend on G_ENABLE_DEBUG,
        just add an empty g_slice_debug_tree_statistics () implementation
        in the !G_ENABLE_DEBUG case.

svn path=/trunk/; revision=5318

diff --git a/ChangeLog b/ChangeLog
index 4daccd477ac1bc075e331cb89352c90c359ff6f2..9b14256467c80e13c6779529be4cc1cca0419413 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-30  Matthias Clasen <mclasen@redhat.com>
+
+       * glib/glib.symbols:
+       * glib/gslice.h:
+       * glib/gslice.c: Don't make ABI depend on G_ENABLE_DEBUG,
+       just add an empty g_slice_debug_tree_statistics () implementation
+       in the !G_ENABLE_DEBUG case.
+
 2007-01-26  Matthias Clasen <mclasen@redhat.com>
 
        * configure.in: Define G_GNUC_INTERNAL for Sun Studio

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 9c1aeae9d21ab3532616870c7c61d8fbc59c0581..ef1adc6e5230c76868106324bdecccfb6ede903d 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -686,11 +686,9 @@ g_slice_free_chain_with_offset
 g_slice_set_config
 g_slice_get_config
 g_slice_get_config_state
-#ifdef G_ENABLE_DEBUG
 g_slice_debug_tree_statistics
 #endif
 #endif
-#endif
 
 #if IN_HEADER(__G_MESSAGES_H__)
 #if IN_FILE(__G_MESSAGES_C__)

diff --git a/glib/gslice.c b/glib/gslice.c
index 3b67e5ead86e7f84489e701d3d61d6242199edd8..1f87286f4e939790b97ee154399eedb664606659 100644 (file)
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -1379,10 +1379,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)
     {
@@ -1438,8 +1438,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 */
+}
 
 #define __G_SLICE_C__
 #include "galiasdef.c"

diff --git a/glib/gslice.h b/glib/gslice.h
index 8d59567c91c87fb2f69038a9097ce2836518fba2..43908418ae9c9ca669f47daa1fddcbc3599e1929 100644 (file)
--- a/glib/gslice.h
+++ b/glib/gslice.h
@@ -71,9 +71,7 @@ typedef enum {
 void     g_slice_set_config       (GSliceConfig ckey, gint64 value);
 gint64   g_slice_get_config       (GSliceConfig ckey);
 gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
-#ifdef  G_ENABLE_DEBUG
 void     g_slice_debug_tree_statistics (void);
-#endif /* G_ENABLE_DEBUG */
 
 G_END_DECLS