From a4c82651dbaeff937f2351519a93df0f5635b7c8 Mon Sep 17 00:00:00 2001 From: barbieri Date: Sat, 23 Oct 2010 20:57:08 +0000 Subject: [PATCH] fix amalgamation build git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@53821 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/mp/chained_pool/eina_chained_mempool.c | 14 +++++++------- src/modules/mp/one_big/eina_one_big.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/modules/mp/chained_pool/eina_chained_mempool.c b/src/modules/mp/chained_pool/eina_chained_mempool.c index 859d44b..c93d704 100644 --- a/src/modules/mp/chained_pool/eina_chained_mempool.c +++ b/src/modules/mp/chained_pool/eina_chained_mempool.c @@ -52,12 +52,12 @@ #ifdef DEBUG #include "eina_log.h" -static int _eina_mempool_log_dom = -1; +static int _eina_chained_mp_log_dom = -1; #ifdef INF #undef INF #endif -#define INF(...) EINA_LOG_DOM_INFO(_eina_mempool_log_dom, __VA_ARGS__) +#define INF(...) EINA_LOG_DOM_INFO(_eina_chained_mp_log_dom, __VA_ARGS__) #endif typedef struct _Chained_Mempool Chained_Mempool; @@ -405,9 +405,9 @@ static Eina_Mempool_Backend _eina_chained_mp_backend = { Eina_Bool chained_init(void) { #ifdef DEBUG - _eina_mempool_log_dom = eina_log_domain_register("eina_mempool", - EINA_LOG_COLOR_DEFAULT); - if (_eina_mempool_log_dom < 0) + _eina_chained_mp_log_dom = eina_log_domain_register("eina_mempool", + EINA_LOG_COLOR_DEFAULT); + if (_eina_chained_mp_log_dom < 0) { EINA_LOG_ERR("Could not register log domain: eina_mempool"); return EINA_FALSE; @@ -421,8 +421,8 @@ void chained_shutdown(void) { eina_mempool_unregister(&_eina_chained_mp_backend); #ifdef DEBUG - eina_log_domain_unregister(_eina_mempool_log_dom); - _eina_mempool_log_dom = -1; + eina_log_domain_unregister(_eina_chained_mp_log_dom); + _eina_chained_mp_log_dom = -1; #endif } diff --git a/src/modules/mp/one_big/eina_one_big.c b/src/modules/mp/one_big/eina_one_big.c index 38c4744..66fed4d 100644 --- a/src/modules/mp/one_big/eina_one_big.c +++ b/src/modules/mp/one_big/eina_one_big.c @@ -54,9 +54,9 @@ #ifdef WRN #undef WRN #endif -#define WRN(...) EINA_LOG_DOM_WARN(_eina_mempool_log_dom, __VA_ARGS__) +#define WRN(...) EINA_LOG_DOM_WARN(_eina_one_big_mp_log_dom, __VA_ARGS__) -static int _eina_mempool_log_dom = -1; +static int _eina_one_big_mp_log_dom = -1; typedef struct _One_Big One_Big; struct _One_Big @@ -374,9 +374,9 @@ static Eina_Mempool_Backend _eina_one_big_mp_backend = { Eina_Bool one_big_init(void) { #ifdef DEBUG - _eina_mempool_log_dom = eina_log_domain_register("eina_one_big_mempool", - EINA_LOG_COLOR_DEFAULT); - if (_eina_mempool_log_dom < 0) + _eina_one_big_mp_log_dom = eina_log_domain_register("eina_one_big_mempool", + EINA_LOG_COLOR_DEFAULT); + if (_eina_one_big_mp_log_dom < 0) { EINA_LOG_ERR("Could not register log domain: eina_one_big_mempool"); return EINA_FALSE; @@ -390,8 +390,8 @@ void one_big_shutdown(void) { eina_mempool_unregister(&_eina_one_big_mp_backend); #ifdef DEBUG - eina_log_domain_unregister(_eina_mempool_log_dom); - _eina_mempool_log_dom = -1; + eina_log_domain_unregister(_eina_one_big_mp_log_dom); + _eina_one_big_mp_log_dom = -1; #endif } -- 2.7.4