summaryrefslogtreecommitdiff
path: root/gobject
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-11-04 20:09:48 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-11-04 20:09:48 +0000
commitd4407e38fae560bae6a66dd9ae5b2f58b9d89134 (patch)
tree4ea7e8fe6d38876de5de4634ce9f75fe487a9837 /gobject
parentb29e35c773c1b8aacddece1f957ccec6b19cbf46 (diff)
downloadglib-d4407e38fae560bae6a66dd9ae5b2f58b9d89134.tar.gz
glib-d4407e38fae560bae6a66dd9ae5b2f58b9d89134.tar.bz2
glib-d4407e38fae560bae6a66dd9ae5b2f58b9d89134.zip
Include config.h so DISABLE_MEMPOOLS actually has an effect. (#96437,
Mon Nov 4 14:41:48 2002 Owen Taylor <otaylor@redhat.com> * glib/gbsearcharray.c: Include config.h so DISABLE_MEMPOOLS actually has an effect. (#96437, Morten Welinder) * tests/uri-test.c: Include <config.h> Mon Nov 4 14:42:36 2002 Owen Taylor <otaylor@redhat.com> * gtype.c gsignal.c gvaluearray.c: Include config.h so DISABLE_MEMPOOLS actually has an effect. (#96437, Morten Welinder) * gsignal.c: Conditionalize definition of g_handler_ts on DISABLE_MEM_POOLS (#96437) Mon Nov 4 14:45:24 2002 Owen Taylor <otaylor@redhat.com> * gthread-posix.c gthread-solaris.c: Include <config.h>
Diffstat (limited to 'gobject')
-rw-r--r--gobject/ChangeLog9
-rw-r--r--gobject/gsignal.c4
-rw-r--r--gobject/gtype.c1
-rw-r--r--gobject/gvaluearray.c2
4 files changed, 16 insertions, 0 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 4c8bdc970..6bd72844b 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 4 14:42:36 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtype.c gsignal.c gvaluearray.c: Include config.h
+ so DISABLE_MEMPOOLS actually has an effect.
+ (#96437, Morten Welinder)
+
+ * gsignal.c: Conditionalize definition of g_handler_ts
+ on DISABLE_MEM_POOLS (#96437)
+
2002-10-16 Matthias Clasen <maclas@gmx.de>
* glib-mkenums.in: Support for template files.
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 893667592..3050ded24 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -24,6 +24,8 @@
* MT safe
*/
+#include <config.h>
+
#include "gsignal.h"
#include "gbsearcharray.h"
#include "gvaluecollector.h"
@@ -248,7 +250,9 @@ static GBSearchConfig g_class_closure_bconfig = G_STATIC_BCONFIG (sizeof (ClassC
static GHashTable *g_handler_list_bsa_ht = NULL;
static Emission *g_recursive_emissions = NULL;
static Emission *g_restart_emissions = NULL;
+#ifndef DISABLE_MEM_POOLS
static GTrashStack *g_handler_ts = NULL;
+#endif
static gulong g_handler_sequential_number = 1;
G_LOCK_DEFINE_STATIC (g_signal_mutex);
#define SIGNAL_LOCK() G_LOCK (g_signal_mutex)
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 7a302da78..d299f51c0 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -16,6 +16,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gtype.h"
/*
diff --git a/gobject/gvaluearray.c b/gobject/gvaluearray.c
index 44685482e..908724270 100644
--- a/gobject/gvaluearray.c
+++ b/gobject/gvaluearray.c
@@ -21,6 +21,8 @@
* MT safe
*/
+#include <config.h>
+
#include "gvaluearray.h"
#include <string.h>
#include <stdlib.h> /* qsort() */