Protect the the various push/pop allocator functions by #ifndef

2004-12-02  Matthias Clasen  <mclasen@redhat.com>

	* glib/glib.symbols: Protect the the various push/pop allocator
	functions by #ifndef DISABLE_MEM_POOLS.  (#160215, Frederic Crozat)

	* glib/makegalias.pl: Support #ifndef'ed sections.

diff --git a/ChangeLog b/ChangeLog
index 39dc77277a6fccc8297f8326e18129dcd9f5ac82..df473e710e959e36c0bbf7778595f261039d92d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/glib.symbols: Protect the the various push/pop allocator
+       functions by #ifndef DISABLE_MEM_POOLS.  (#160215, Frederic Crozat)
+
+       * glib/makegalias.pl: Support #ifndef'ed sections.
+
        * glib/gutils.c (g_get_system_config_dirs): Don't forget to 
        initialize g_system_config_dirs.  (#160213, Frederic Crozat)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 39dc77277a6fccc8297f8326e18129dcd9f5ac82..df473e710e959e36c0bbf7778595f261039d92d0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/glib.symbols: Protect the the various push/pop allocator
+       functions by #ifndef DISABLE_MEM_POOLS.  (#160215, Frederic Crozat)
+
+       * glib/makegalias.pl: Support #ifndef'ed sections.
+
        * glib/gutils.c (g_get_system_config_dirs): Don't forget to 
        initialize g_system_config_dirs.  (#160213, Frederic Crozat)
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 39dc77277a6fccc8297f8326e18129dcd9f5ac82..df473e710e959e36c0bbf7778595f261039d92d0 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,10 @@
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/glib.symbols: Protect the the various push/pop allocator
+       functions by #ifndef DISABLE_MEM_POOLS.  (#160215, Frederic Crozat)
+
+       * glib/makegalias.pl: Support #ifndef'ed sections.
+
        * glib/gutils.c (g_get_system_config_dirs): Don't forget to 
        initialize g_system_config_dirs.  (#160213, Frederic Crozat)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 39dc77277a6fccc8297f8326e18129dcd9f5ac82..df473e710e959e36c0bbf7778595f261039d92d0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/glib.symbols: Protect the the various push/pop allocator
+       functions by #ifndef DISABLE_MEM_POOLS.  (#160215, Frederic Crozat)
+
+       * glib/makegalias.pl: Support #ifndef'ed sections.
+
        * glib/gutils.c (g_get_system_config_dirs): Don't forget to 
        initialize g_system_config_dirs.  (#160213, Frederic Crozat)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 39dc77277a6fccc8297f8326e18129dcd9f5ac82..df473e710e959e36c0bbf7778595f261039d92d0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/glib.symbols: Protect the the various push/pop allocator
+       functions by #ifndef DISABLE_MEM_POOLS.  (#160215, Frederic Crozat)
+
+       * glib/makegalias.pl: Support #ifndef'ed sections.
+
        * glib/gutils.c (g_get_system_config_dirs): Don't forget to 
        initialize g_system_config_dirs.  (#160213, Frederic Crozat)
 

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 0c3eb93e3ab60d67a7b6ce1c4951209406566a4f..67c6b83f861450ddfc729b56a927efe3b57f9540 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -379,10 +379,12 @@ g_list_length
 g_list_nth
 g_list_nth_data
 g_list_nth_prev
+#ifndef DISABLE_MEM_POOLS
 g_list_pop_allocator
+g_list_push_allocator
+#endif
 g_list_position
 g_list_prepend
-g_list_push_allocator
 g_list_remove
 g_list_remove_all
 g_list_remove_link
@@ -481,9 +483,11 @@ g_node_n_children
 g_node_new
 g_node_n_nodes
 g_node_nth_child
+#ifndef DISABLE_MEM_POOLS
 g_node_pop_allocator
-g_node_prepend
 g_node_push_allocator
+#endif
+g_node_prepend
 g_node_reverse_children
 g_node_traverse
 g_node_unlink
@@ -660,10 +664,12 @@ g_slist_last
 g_slist_length
 g_slist_nth
 g_slist_nth_data
+#ifndef DISABLE_MEM_POOLS
 g_slist_pop_allocator
+g_slist_push_allocator
+#endif
 g_slist_position
 g_slist_prepend
-g_slist_push_allocator
 g_slist_remove
 g_slist_remove_all
 g_slist_remove_link

diff --git a/glib/makegalias.pl b/glib/makegalias.pl
index 786232b7409a4a29ed8fdbe8dedf85830be40941..daa6769ff64fab719dab5af667c29cc38128e8f2 100755 (executable)
--- a/glib/makegalias.pl
+++ b/glib/makegalias.pl
@@ -70,7 +70,7 @@ while (<>) {
       next;
   }
 
-  if ($_ =~ /^\#ifdef\s+G/)
+  if ($_ =~ /^\#ifn?def\s+(G|DISABLE_MEM_POOLS)/)
   {
       print $_;