diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-11-22 19:25:03 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-11-22 19:25:03 -0500 |
| commit | 2da24259ab2a4da63885155460e281beb3d5998b (patch) | |
| tree | dde3b31bf119ff0ca01349bb1f00a04b57cd55d2 /gobject | |
| parent | 6dde6b7f21af0d3748f142c3f718f1d4cb21739e (diff) | |
| download | glib-2da24259ab2a4da63885155460e281beb3d5998b.tar.gz | |
Fix !debug builds
As pointed out by Chun-wei Fan in bug 664455, parts of the merged
gobjectnotifyqueue.c code ended up inside an #ifdef G_ENABLE_DEBUG
section.
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/gobject.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gobject/gobject.c b/gobject/gobject.c index 36fc04dbe..97b4b7252 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -201,14 +201,6 @@ static guint (*floating_flag_handler) (GObject*, gint) = object_floating_flag_ha G_LOCK_DEFINE_STATIC (construction_mutex); static GSList *construction_objects = NULL; -/* --- functions --- */ -#ifdef G_ENABLE_DEBUG -#define IF_DEBUG(debug_type) if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type) -G_LOCK_DEFINE_STATIC (debug_objects); -static volatile GObject *g_trap_object_ref = NULL; -static guint debug_objects_count = 0; -static GHashTable *debug_objects_ht = NULL; - G_LOCK_DEFINE_STATIC(notify_lock); /* --- functions --- */ @@ -314,6 +306,13 @@ g_object_notify_queue_add (GObject *object, G_UNLOCK(notify_lock); } +#ifdef G_ENABLE_DEBUG +#define IF_DEBUG(debug_type) if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type) +G_LOCK_DEFINE_STATIC (debug_objects); +static volatile GObject *g_trap_object_ref = NULL; +static guint debug_objects_count = 0; +static GHashTable *debug_objects_ht = NULL; + static void debug_objects_foreach (gpointer key, gpointer value, |