From 6a6d92a218f388dcd5056dd2f89c1657560e0558 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 30 Jan 2007 18:12:28 +0000 Subject: [PATCH] Don't make ABI depend on G_ENABLE_DEBUG, just add an empty 2007-01-30 Matthias Clasen * 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 --- ChangeLog | 8 ++++++++ glib/glib.symbols | 2 -- glib/gslice.c | 4 ++-- glib/gslice.h | 2 -- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4daccd47..9b142564 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-01-30 Matthias Clasen + + * 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 * configure.in: Define G_GNUC_INTERNAL for Sun Studio diff --git a/glib/glib.symbols b/glib/glib.symbols index 9c1aeae9..ef1adc6e 100644 --- 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 3b67e5ea..1f87286f 100644 --- 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 8d59567c..43908418 100644 --- 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 -- 2.34.1