enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

add MIN define for non-linux systems

This commit is contained in:
Vincent Torri 2015-02-15 17:53:47 -05:00 committed by Mike Blumenkrantz
parent c37a55d573
commit f31ed5bcb1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e.h
View File

@ -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)))

4
src/bin/e_comp_object.c
View File

@ -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);