summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-05-09 16:56:38 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-05-09 16:58:53 -0700
commitd00643fcc4ebe2de3d9abf21edd0a7f55d99972c (patch)
treea46ca57da3d81c26cd2544f1110194aef1d679f4
parent1c5ce165658820643511ff784d0c210969173a45 (diff)
eina: add MIN/MAX redefine as we use it everywhere.
This is done on an attempt to permanently fix our Windows port. Windows doesn't have MIN/MAX, so we should always do a ifndef/define in every piece of code that use it. Of course we always forget and it take times to notice and fix. We have over the year added it in many private headers, but as the issue continue to raise again and again, I prefer to get this fixed in our main header.
-rw-r--r--src/lib/eina/eina_cpu.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/eina/eina_cpu.h b/src/lib/eina/eina_cpu.h
index bb7082b37c..e97d61417e 100644
--- a/src/lib/eina/eina_cpu.h
+++ b/src/lib/eina/eina_cpu.h
@@ -122,6 +122,14 @@ static inline unsigned int eina_swap32(unsigned int x);
122 */ 122 */
123static inline unsigned long long eina_swap64(unsigned long long x); 123static inline unsigned long long eina_swap64(unsigned long long x);
124 124
125#ifndef MIN
126# define MIN(x, y) (((x) > (y)) ? (y) : (x))
127#endif
128
129#ifndef MAX
130# define MAX(x, y) (((x) > (y)) ? (x) : (y))
131#endif
132
125#include "eina_inline_cpu.x" 133#include "eina_inline_cpu.x"
126 134
127/** 135/**