From 4290e73c471e4451f35852874500163e121c66ec Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 2 Dec 2004 15:28:30 +0000 Subject: [PATCH] Protect the the various push/pop allocator functions by #ifndef 2004-12-02 Matthias Clasen * 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. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/glib.symbols | 12 +++++++++--- glib/makegalias.pl | 2 +- 7 files changed, 35 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39dc7727..df473e71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-12-02 Matthias Clasen + * 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 39dc7727..df473e71 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-12-02 Matthias Clasen + * 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 39dc7727..df473e71 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,10 @@ 2004-12-02 Matthias Clasen + * 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 39dc7727..df473e71 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-12-02 Matthias Clasen + * 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 39dc7727..df473e71 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-12-02 Matthias Clasen + * 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 0c3eb93e..67c6b83f 100644 --- 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 786232b7..daa6769f 100755 --- 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 $_; -- 2.34.1