diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2011-11-18 17:44:42 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2011-11-18 17:44:42 +0000 |
| commit | 8a4dc3c011fb3dfe8157dfc228fedd72a81c3c12 (patch) | |
| tree | cf2e2dea9c880e3ca7be6ff89c1b9355a15caedf /clutter/clutter-debug.h | |
| parent | 92585be4d805a1cb0b60df92a0b235fd1a2824be (diff) | |
| download | clutter-8a4dc3c011fb3dfe8157dfc228fedd72a81c3c12.tar.gz | |
debug: Clean up profile/debug symbols
Since we have a _clutter_debug_message() function compiled in
unconditionally we have no further need for the equivalent conditional
version defined in clutter-profile.[ch]: we can simply do the work in
one function.
Diffstat (limited to 'clutter/clutter-debug.h')
| -rw-r--r-- | clutter/clutter-debug.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/clutter/clutter-debug.h b/clutter/clutter-debug.h index 8faaf4899..7cf7f4a50 100644 --- a/clutter/clutter-debug.h +++ b/clutter/clutter-debug.h @@ -3,7 +3,6 @@ #include <glib.h> #include "clutter-main.h" -#include "clutter-profile.h" G_BEGIN_DECLS @@ -50,25 +49,24 @@ typedef enum { #ifdef __GNUC__ /* Try the GCC extension for valists in macros */ -#define CLUTTER_NOTE(type,x,a...) G_STMT_START { \ - if (G_UNLIKELY (CLUTTER_HAS_DEBUG (type))) \ - { _clutter_profile_trace_message ("[" #type "]:" \ - G_STRLOC ": " x, ##a); } \ - } G_STMT_END +#define CLUTTER_NOTE(type,x,a...) G_STMT_START { \ + if (G_UNLIKELY (CLUTTER_HAS_DEBUG (type))) { \ + _clutter_debug_message ("[" #type "]:" \ + G_STRLOC ": " x, ##a); \ + } } G_STMT_END #else /* !__GNUC__ */ /* Try the C99 version; unfortunately, this does not allow us to pass * empty arguments to the macro, which means we have to * do an intemediate printf. */ -#define CLUTTER_NOTE(type,...) G_STMT_START { \ - if (G_UNLIKELY (CLUTTER_HAS_DEBUG (type))) \ - { \ - gchar * _fmt = g_strdup_printf (__VA_ARGS__); \ - _clutter_profile_trace_message ("[" #type "]:" \ - G_STRLOC ": %s",_fmt); \ - g_free (_fmt); \ - } } G_STMT_END +#define CLUTTER_NOTE(type,...) G_STMT_START { \ + if (G_UNLIKELY (CLUTTER_HAS_DEBUG (type))) { \ + gchar * _fmt = g_strdup_printf (__VA_ARGS__); \ + _clutter_debug_message ("[" #type "]:" \ + G_STRLOC ": %s", _fmt); \ + g_free (_fmt); \ + } } G_STMT_END #endif #else /* !CLUTTER_ENABLE_DEBUG */ |