forked from enlightenment/enlightenment
more build fixes: MAX into e.h if not defined, remove other definitions as pointed out by Robert David
ticket #1757 (2/3) SVN revision: 79138
This commit is contained in:
parent
cf98c0003f
commit
15b668e01a
|
@ -160,6 +160,9 @@ typedef struct _E_Before_Idler E_Before_Idler;
|
||||||
typedef struct _E_Rect E_Rect;
|
typedef struct _E_Rect E_Rect;
|
||||||
|
|
||||||
/* convenience macro to compress code and avoid typos */
|
/* convenience macro to compress code and avoid typos */
|
||||||
|
#ifndef MAX
|
||||||
|
# define MAX(x, y) (((x) > (y)) ? (x) : (y))
|
||||||
|
#endif
|
||||||
# define E_FN_DEL(_fn, _h) if (_h) { _fn(_h); _h = NULL; }
|
# define E_FN_DEL(_fn, _h) if (_h) { _fn(_h); _h = NULL; }
|
||||||
# define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \
|
# define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \
|
||||||
(((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))
|
(((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
|
|
||||||
#ifndef MAX
|
|
||||||
# define MAX(x, y) (((x) > (y)) ? (x) : (y))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define INITS
|
#define INITS
|
||||||
#define ACT_GO(name) \
|
#define ACT_GO(name) \
|
||||||
{ \
|
{ \
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
|
|
||||||
#ifndef MAX
|
|
||||||
# define MAX(x, y) (((x) > (y)) ? (x) : (y))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* TODO:
|
/* TODO:
|
||||||
* - Track execution status
|
* - Track execution status
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -11,10 +11,6 @@
|
||||||
#define MOD_CFG_FILE_VERSION \
|
#define MOD_CFG_FILE_VERSION \
|
||||||
((MOD_CFG_FILE_EPOCH << 16) | MOD_CFG_FILE_GENERATION)
|
((MOD_CFG_FILE_EPOCH << 16) | MOD_CFG_FILE_GENERATION)
|
||||||
|
|
||||||
#undef MAX
|
|
||||||
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
|
|
||||||
|
|
||||||
|
|
||||||
typedef enum _Popup_Corner Popup_Corner;
|
typedef enum _Popup_Corner Popup_Corner;
|
||||||
typedef struct _Config Config;
|
typedef struct _Config Config;
|
||||||
typedef struct _Config_Item Config_Item;
|
typedef struct _Config_Item Config_Item;
|
||||||
|
|
Loading…
Reference in New Issue