Guard g_slice_debug_tree_statistics by G_ENABLE_DEBUG. (#390940, Kazuki

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

        * glib/glib.symbols: Guard g_slice_debug_tree_statistics
        by G_ENABLE_DEBUG.  (#390940, Kazuki Iwamoto)

svn path=/trunk/; revision=5190

diff --git a/ChangeLog b/ChangeLog
index a9b0b85..32c856b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols: Guard g_slice_debug_tree_statistics
+       by G_ENABLE_DEBUG.  (#390940, Kazuki Iwamoto)
+
 2007-01-02  Michael Natterer  <mitch@imendio.com>
 
        * configure.in

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index f3000cb..58b5254 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-02  Matthias Clasen  <mclasen@redhat.com>
+       
+       * glib/running.sgml: Remove C99ism from example.
+
 2006-12-31  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/tmpl/threads.sgml: Fix whitespace.  (#391116)

diff --git a/docs/reference/glib/running.sgml b/docs/reference/glib/running.sgml
index 910a3ee..8aae4f4 100644 (file)
--- a/docs/reference/glib/running.sgml
+++ b/docs/reference/glib/running.sgml
@@ -158,8 +158,8 @@ variables like <envar>LANG</envar>, <envar>PATH</envar> or <envar>HOME</envar>.
                  A potential cause for such a situation that will be caught by G_SLICE=debug-blocks
                  is e.g.:
                  <programlisting>
-                   void *slist = g_slist_alloc(); // void* gives up type-safety
-                   g_list_free (slist);           // corruption: sizeof (GSList) != sizeof (GList)
+                   void *slist = g_slist_alloc(); /* void* gives up type-safety */
+                   g_list_free (slist);           /* corruption: sizeof (GSList) != sizeof (GList) */
                  </programlisting>
                </para>
              </listitem>

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 9a31540..bfad3e2 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -686,7 +686,7 @@ g_slice_free_chain_with_offset
 g_slice_set_config
 g_slice_get_config
 g_slice_get_config_state
-#ifndef G_DISABLE_DEPRECATED
+#ifdef G_ENABLE_DEBUG
 g_slice_debug_tree_statistics
 #endif
 #endif