seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=30a3d9263379e430dae63e2256b400dbb946a940
commit 30a3d9263379e430dae63e2256b400dbb946a940 Author: Daniel Juyung Seo <[email protected]> Date: Thu Jan 23 23:15:39 2014 +0900 elm: Defined the same macro, MAX and MIN, in elm_priv.h MAX and MIN are defined in a couple of places and they was already defined in elm_priv.h. So use elm_priv.h's one. I also moved CEIL to elm_priv.h that can be used in another places. --- src/lib/elm_conform.c | 8 -------- src/lib/elm_diskselector.c | 8 -------- src/lib/elm_hover.c | 4 ---- src/lib/elm_priv.h | 3 +++ 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index d8ced04..cce0255 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -14,14 +14,6 @@ EAPI Eo_Op ELM_OBJ_CONFORMANT_BASE_ID = EO_NOOP; #define MY_CLASS_NAME "Elm_Conformant" #define MY_CLASS_NAME_LEGACY "elm_conformant" -#ifndef MIN -# define MIN(a, b) ((a) < (b)) ? (a) : (b) -#endif - -#ifndef MAX -# define MAX(a, b) ((a) < (b)) ? (b) : (a) -#endif - static char CONFORMANT_KEY[] = "_elm_conform_key"; #define ELM_CONFORM_INDICATOR_TIME 1.0 diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index 8a30f36..b61cfe7 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -7,14 +7,6 @@ #include "elm_widget_diskselector.h" #include "elm_interface_scrollable.h" -#ifndef MAX -# define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef CEIL -#define CEIL(a) (((a) % 2 != 0) ? ((a) / 2 + 1) : ((a) / 2)) -#endif - #define DISPLAY_ITEM_NUM_MIN 3 EAPI Eo_Op ELM_OBJ_DISKSELECTOR_BASE_ID = EO_NOOP; diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c index a77dbb5..13196fc 100644 --- a/src/lib/elm_hover.c +++ b/src/lib/elm_hover.c @@ -14,10 +14,6 @@ EAPI Eo_Op ELM_OBJ_HOVER_BASE_ID = EO_NOOP; #define MY_CLASS_NAME "Elm_Hover" #define MY_CLASS_NAME_LEGACY "elm_hover" -#ifndef MAX -# define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#endif - #define ELM_HOVER_PARTS_FOREACH unsigned int i; \ for (i = 0; i < sizeof(sd->subs) / sizeof(sd->subs[0]); i++) diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index a63257e..c20e5b1 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -159,6 +159,9 @@ extern const char *_elm_engines[]; #define MIN(x, y) (((x) < (y)) ? (x) : (y)) #undef MAX #define MAX(x, y) (((x) > (y)) ? (x) : (y)) +#undef CEIL +#define CEIL(a) (((a) % 2 != 0) ? ((a) / 2 + 1) : ((a) / 2)) + #define ELM_SAFE_FREE(_h, _fn) do { _fn((void*)_h); _h = NULL; } while (0) --
