From f31ed5bcb11931fe30bb2752439ef5c9ec9819ea Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sun, 15 Feb 2015 17:53:47 -0500 Subject: [PATCH] add MIN define for non-linux systems --- src/bin/e.h | 4 ++++ src/bin/e_comp_object.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/e.h b/src/bin/e.h index ddb87b347..f78f6fb85 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -185,6 +185,10 @@ typedef struct _E_Rect E_Rect; # define MAX(x, y) (((x) > (y)) ? (x) : (y)) #endif +#ifndef MIN +# define MIN(x, y) (((x) < (y)) ? (x) : (y)) +#endif + # define E_FREE_FUNC(_h, _fn) do { if (_h) { _fn((void*)_h); _h = NULL; } } while (0) # define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \ (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy))) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index e3de55f87..d6d8e486e 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -41,7 +41,7 @@ #define INTERNAL_ENTRY E_Comp_Object *cw; cw = evas_object_smart_data_get(obj); /* enable for lots of client size info in console output */ -#if 1 +#if 0 # define e_util_size_debug_set(x, y) #endif @@ -2655,7 +2655,7 @@ e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h) if (!cw->input_obj) { cw->input_obj = evas_object_rectangle_add(cw->comp->evas); - //e_util_size_debug_set(cw->input_obj, 1); + e_util_size_debug_set(cw->input_obj, 1); evas_object_name_set(cw->input_obj, "cw->input_obj"); evas_object_color_set(cw->input_obj, 0, 0, 0, 0); evas_object_pass_events_set(cw->obj, 1);