[Telepathy-commits] [telepathy-mission-control/master] Allow inlining

[Alberto Mardegan]

The debug level variable must be exported, for the _mcd_debug_get_level() to be
inlined.
---
 src/mcd-debug.c |   17 ++++++-----------
 src/mcd-debug.h |    9 +++++++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/mcd-debug.c b/src/mcd-debug.c
index 055515c..30d2e2d 100644
--- a/src/mcd-debug.c
+++ b/src/mcd-debug.c
@@ -38,7 +38,7 @@
 #include "mcd-debug.h"
 #include "mcd-operation.h"
 
-static gint mc_debug = 0;
+gint mcd_debug_level = 0;
 
 gpointer
 mcd_debug_ref (gpointer obj, const gchar *filename, gint linenum)
@@ -47,7 +47,7 @@ mcd_debug_ref (gpointer obj, const gchar *filename, gint linenum)
     gpointer (*untouchable_ref) (gpointer object);
     
     untouchable_ref = g_object_ref;
-    if (mc_debug >= 2)
+    if (mcd_debug_level >= 2)
 	g_debug ("[%s:%d]: Referencing (%d) object %p of type %s",
 		 filename, linenum, G_OBJECT (obj)->ref_count,
 		 obj, G_OBJECT_TYPE_NAME(obj));
@@ -60,7 +60,7 @@ mcd_debug_unref (gpointer obj, const gchar *filename, gint linenum)
     void (*untouchable_unref) (gpointer object);
     
     untouchable_unref = g_object_unref;
-    if (mc_debug >= 2)
+    if (mcd_debug_level >= 2)
 	g_debug ("[%s:%d]: Unreferencing (%d) object %p of type %s",
 		 filename, linenum, G_OBJECT (obj)->ref_count, obj,
 		 G_OBJECT_TYPE_NAME(obj));
@@ -102,7 +102,7 @@ mcd_debug_print_tree (gpointer object)
 {
     g_return_if_fail (MCD_IS_MISSION (object));
 
-    if (mc_debug >= 2)
+    if (mcd_debug_level >= 2)
     {
 	g_debug ("Object Hierarchy of object %p", object);
 	g_debug ("[");
@@ -117,17 +117,12 @@ void mcd_debug_init ()
 
     mc_debug_str = getenv ("MC_DEBUG");
     if (mc_debug_str)
-	mc_debug = atoi (mc_debug_str);
-}
-
-inline gint mcd_debug_get_level ()
-{
-    return mc_debug;
+	mcd_debug_level = atoi (mc_debug_str);
 }
 
 void
 mcd_debug_set_level (gint level)
 {
-    mc_debug = level;
+    mcd_debug_level = level;
 }
 
diff --git a/src/mcd-debug.h b/src/mcd-debug.h
index 93f217e..405892f 100644
--- a/src/mcd-debug.h
+++ b/src/mcd-debug.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #ifdef ENABLE_DEBUG
 
 #define DEBUG(format, ...) do {             \
-    if (mcd_debug_get_level () > 0)         \
+    if (_mcd_debug_get_level () > 0)        \
         g_debug (format, ##__VA_ARGS__);    \
 } while (0)
 
@@ -50,10 +50,15 @@ G_BEGIN_DECLS
 
 #endif /* ENABLE_DEBUG */
 
+extern gint mcd_debug_level;
+
 void mcd_debug_init (void);
 
 void mcd_debug_set_level (gint level);
-inline gint mcd_debug_get_level (void);
+static inline gint _mcd_debug_get_level (void)
+{
+    return mcd_debug_level;
+}
 
 gpointer mcd_debug_ref (gpointer obj, const gchar *filename, gint linenum);
 void mcd_debug_unref (gpointer obj, const gchar *filename, gint linenum);
-- 
1.5.6.5