summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-12-26 12:22:05 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-12-26 12:27:13 +0900
commit76d8532b5465362f85b75a2a7a5cc3c419304a92 (patch)
tree73482a7b3a246f56d555fd206903db683b14c6aa /src/lib/ecore
parent10dd650d90d050889771f88d8b01eb7c1f51b0bd (diff)
efl: Unified eina critical manro to CRI.
Being annoyed by different types of eina critical macros - CRI, CRIT, CRITICAL -, I concluded to unify them to one. Discussed on IRC and finally, CRI was chosen to meet the consistency with other macros - ERR, WRN, INF, DBG - in terms of the number of characters. If there is any missing bits, please let me know.
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/ecore_main.c2
-rw-r--r--src/lib/ecore/ecore_private.h6
-rw-r--r--src/lib/ecore/ecore_time.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 44fb957f51..e1ee7b1e96 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -858,7 +858,7 @@ _ecore_main_loop_init(void)
858#ifdef USE_G_MAIN_LOOP 858#ifdef USE_G_MAIN_LOOP
859 ecore_glib_source = g_source_new(&ecore_gsource_funcs, sizeof (GSource)); 859 ecore_glib_source = g_source_new(&ecore_gsource_funcs, sizeof (GSource));
860 if (!ecore_glib_source) 860 if (!ecore_glib_source)
861 CRIT("Failed to create glib source for epoll!"); 861 CRI("Failed to create glib source for epoll!");
862 else 862 else
863 { 863 {
864 g_source_set_priority(ecore_glib_source, G_PRIORITY_HIGH_IDLE + 20); 864 g_source_set_priority(ecore_glib_source, G_PRIORITY_HIGH_IDLE + 20);
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index f6a2d5553a..7be334ce3a 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -34,10 +34,10 @@ extern int _ecore_log_dom;
34#endif 34#endif
35#define WRN(...) EINA_LOG_DOM_WARN(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__) 35#define WRN(...) EINA_LOG_DOM_WARN(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__)
36 36
37#ifdef CRIT 37#ifdef CRI
38# undef CRIT 38# undef CRI
39#endif 39#endif
40#define CRIT(...) EINA_LOG_DOM_CRIT(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__) 40#define CRI(...) EINA_LOG_DOM_CRIT(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__)
41 41
42#ifndef PATH_MAX 42#ifndef PATH_MAX
43# define PATH_MAX 4096 43# define PATH_MAX 4096
diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index d3bac94310..79dff91876 100644
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -57,7 +57,7 @@ ecore_time_get(void)
57 57
58 if (EINA_UNLIKELY(clock_gettime(_ecore_time_clock_id, &t))) 58 if (EINA_UNLIKELY(clock_gettime(_ecore_time_clock_id, &t)))
59 { 59 {
60 CRIT("Cannot get current time."); 60 CRI("Cannot get current time.");
61 /* Try to at least return the latest value retrieved*/ 61 /* Try to at least return the latest value retrieved*/
62 return _ecore_time_loop_time; 62 return _ecore_time_loop_time;
63 } 63 }
@@ -152,7 +152,7 @@ _ecore_time_init(void)
152 else 152 else
153 { 153 {
154 _ecore_time_clock_id = -2; 154 _ecore_time_clock_id = -2;
155 CRIT("Cannot get a valid clock_gettime() clock id! " 155 CRI("Cannot get a valid clock_gettime() clock id! "
156 "Fallback to unix time."); 156 "Fallback to unix time.");
157 } 157 }
158#else 158#else
@@ -170,8 +170,8 @@ _ecore_time_init(void)
170 } 170 }
171# else 171# else
172# warning "Your platform isn't supported yet" 172# warning "Your platform isn't supported yet"
173 CRIT("Platform does not support clock_gettime. " 173 CRI("Platform does not support clock_gettime. "
174 "Fallback to unix time."); 174 "Fallback to unix time.");
175# endif 175# endif
176# endif 176# endif
177#endif 177#endif