more build fixes: MAX into e.h if not defined, remove other definitions as pointed...

ticket #1757 (2/3)

SVN revision: 79138

diff --git a/src/bin/e.h b/src/bin/e.h
index 03b7a30..0b837d7 100644 (file)
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -160,6 +160,9 @@ typedef struct _E_Before_Idler E_Before_Idler;
 typedef struct _E_Rect         E_Rect;
 
 /* 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_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_actions.c b/src/bin/e_actions.c
index a7cfa72..369c447 100644 (file)
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1,9 +1,5 @@
 #include "e.h"
 
-#ifndef MAX
-# define MAX(x, y) (((x) > (y)) ? (x) : (y))
-#endif
-
 #define INITS
 #define ACT_GO(name)                                      \
   {                                                       \

diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 05dc9c6..b1e09ec 100644 (file)
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -1,10 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-#ifndef MAX
-# define MAX(x, y) (((x) > (y)) ? (x) : (y))
-#endif
-
 /* TODO:
  * - Track execution status
  */

diff --git a/src/modules/notification/e_mod_main.h b/src/modules/notification/e_mod_main.h
index 2708276..c081936 100644 (file)
--- a/src/modules/notification/e_mod_main.h
+++ b/src/modules/notification/e_mod_main.h
@@ -11,10 +11,6 @@
 #define MOD_CFG_FILE_VERSION                                   \
 ((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 struct _Config Config;
 typedef struct _Config_Item Config_Item;