From 15b668e01a61c6a52c556a37b63fbbcab227b6bc Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Mon, 12 Nov 2012 09:16:23 +0000
Subject: [PATCH] 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
---
 src/bin/e.h                           | 3 +++
 src/bin/e_actions.c                   | 4 ----
 src/modules/ibar/e_mod_main.c         | 4 ----
 src/modules/notification/e_mod_main.h | 4 ----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/bin/e.h b/src/bin/e.h
index 03b7a30b9..0b837d7bf 100644
--- 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 a7cfa7201..369c447a8 100644
--- 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 05dc9c695..b1e09ec97 100644
--- 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 2708276ac..c081936a9 100644
--- 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;