From e1459be20b2f14f40e74ebfa72cc2b941cb76256 Mon Sep 17 00:00:00 2001 From: barbieri Date: Thu, 1 Sep 2011 23:47:53 +0000 Subject: [PATCH] emotion/generic: make log variable static. yeah, I'm paranoid ;-) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/emotion@63079 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/generic/emotion_generic.c | 10 ++++++++-- src/modules/generic/emotion_generic.h | 7 ------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/modules/generic/emotion_generic.c b/src/modules/generic/emotion_generic.c index 16ef668..97833d6 100644 --- a/src/modules/generic/emotion_generic.c +++ b/src/modules/generic/emotion_generic.c @@ -16,13 +16,19 @@ static Eina_Prefix *pfx = NULL; +static int _emotion_generic_log_domain = -1; +#define DBG(...) EINA_LOG_DOM_DBG(_emotion_generic_log_domain, __VA_ARGS__) +#define INF(...) EINA_LOG_DOM_INFO(_emotion_generic_log_domain, __VA_ARGS__) +#define WRN(...) EINA_LOG_DOM_WARN(_emotion_generic_log_domain, __VA_ARGS__) +#define ERR(...) EINA_LOG_DOM_ERR(_emotion_generic_log_domain, __VA_ARGS__) +#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_generic_log_domain, __VA_ARGS__) + + struct _default_players { const char *name; const char *cmdline; }; -int _emotion_generic_log_domain = -1; - static struct _default_players players[] = { #ifdef EMOTION_BUILD_VLC { "vlc", "em_generic_vlc" }, diff --git a/src/modules/generic/emotion_generic.h b/src/modules/generic/emotion_generic.h index e068d58..62d6044 100644 --- a/src/modules/generic/emotion_generic.h +++ b/src/modules/generic/emotion_generic.h @@ -59,12 +59,5 @@ struct _Emotion_Generic_Video struct _Emotion_Generic_Audio_Channel *audio_channels; }; -extern int _emotion_generic_log_domain; -#define DBG(...) EINA_LOG_DOM_DBG(_emotion_generic_log_domain, __VA_ARGS__) -#define INF(...) EINA_LOG_DOM_INFO(_emotion_generic_log_domain, __VA_ARGS__) -#define WRN(...) EINA_LOG_DOM_WARN(_emotion_generic_log_domain, __VA_ARGS__) -#define ERR(...) EINA_LOG_DOM_ERR(_emotion_generic_log_domain, __VA_ARGS__) -#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_generic_log_domain, __VA_ARGS__) - #endif -- 2.7.4