From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 23 Nov 2011 00:25:03 +0000 (-0500)
Subject: Fix !debug builds
X-Git-Tag: 2.31.4~151
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2da24259ab2a4da63885155460e281beb3d5998b;p=platform%2Fupstream%2Fglib.git

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.
---

diff --git a/gobject/gobject.c b/gobject/gobject.c
index 36fc04d..97b4b72 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,