dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed ECORE_MIN /MAX to MIN/MAX 

SVN revision: 9399
This commit is contained in:
tsauerbeck 2004-03-19 18:40:09 +00:00 committed by tsauerbeck
parent fb596336ab
commit 34e3b8f092
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/ecore/src/lib/ecore/Ecore.h
View File

@ -31,9 +31,13 @@
extern "C" {
#endif
/* FIXME: [deprecated] Convenience macros */
#define ECORE_MIN(x, y) (((x) > (y)) ? (y) : (x))
#define ECORE_MAX(x, y) (((x) > (y)) ? (x) : (y))
#ifndef MIN
#define MIN(x, y) (((x) > (y)) ? (y) : (x))
#endif
#ifndef MAX
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
#endif
#define ECORE_EVENT_NONE 0
#define ECORE_EVENT_EXE_EXIT 1 /**< Spawned Exe has exit event */

6
legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c
View File

@ -170,8 +170,8 @@ _ecore_x_dnd_drag(int x, int y)
if (win)
{
_xdnd->version = ECORE_MIN(ECORE_X_DND_VERSION,
ecore_x_dnd_version_get(win));
_xdnd->version = MIN(ECORE_X_DND_VERSION,
ecore_x_dnd_version_get(win));
if (win != _xdnd->dest)
{
int i;
@ -186,7 +186,7 @@ _ecore_x_dnd_drag(int x, int y)
xev.xclient.data.l[1] &= 0xfffffffeUL;
xev.xclient.data.l[1] |= ((unsigned long) _xdnd->version) << 24;
for (i = 0; i < ECORE_MIN(_xdnd->num_types, 3); ++i)
for (i = 0; i < MIN(_xdnd->num_types, 3); ++i)
xev.xclient.data.l[i + 2] = _xdnd->types[i];
XSendEvent(_ecore_x_disp, win, False, 0, &xev);
_xdnd->await_status = 0;