summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-macros.h3
-rw-r--r--src/lib/ecore/ecore_private.h8
-rw-r--r--src/lib/ecore_win32/ecore_win32_private.h10
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_dnd.c4
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_private.h8
-rw-r--r--src/lib/edje/edje_private.h4
-rw-r--r--src/lib/eet/eet_image.c6
-rw-r--r--src/lib/eina/eina_private.h8
-rw-r--r--src/lib/eina/eina_str.c2
-rw-r--r--src/lib/eina/eina_tiler.c1
-rw-r--r--src/lib/elementary/elm_priv.h4
-rw-r--r--src/lib/evas/canvas/render2/region.c7
-rw-r--r--src/lib/evas/include/evas_macros.h6
-rw-r--r--src/modules/evas/image_loaders/gif/evas_image_load_gif.c3
-rw-r--r--src/static_libs/rg_etc/rg_etc1.c8
-rw-r--r--src/static_libs/rg_etc/rg_etc2.c4
16 files changed, 11 insertions, 75 deletions
diff --git a/src/examples/evas/shooter/evas-3d-shooter-macros.h b/src/examples/evas/shooter/evas-3d-shooter-macros.h
index ce23acf851..d7f21860da 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-macros.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-macros.h
@@ -1,6 +1,3 @@
1#define MAX(x, y) (((x) > (y)) ? (x) : (y))
2#define MIN(x, y) (((x) < (y)) ? (x) : (y))
3
4#define FOG_COLOR 0.5, 0.5, 0.5 1#define FOG_COLOR 0.5, 0.5, 0.5
5#define FOG_FACTOR 0.01 2#define FOG_FACTOR 0.01
6#define WIDTH 1920 3#define WIDTH 1920
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index c95a4d94f0..062c8a2ef9 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -69,14 +69,6 @@ extern int _ecore_log_dom;
69# define PATH_MAX 4096 69# define PATH_MAX 4096
70#endif 70#endif
71 71
72#ifndef MIN
73# define MIN(x, y) (((x) > (y)) ? (y) : (x))
74#endif
75
76#ifndef MAX
77# define MAX(x, y) (((x) > (y)) ? (x) : (y))
78#endif
79
80#ifndef ABS 72#ifndef ABS
81# define ABS(x) ((x) < 0 ? -(x) : (x)) 73# define ABS(x) ((x) < 0 ? -(x) : (x))
82#endif 74#endif
diff --git a/src/lib/ecore_win32/ecore_win32_private.h b/src/lib/ecore_win32/ecore_win32_private.h
index b5a805adde..c90674f2f1 100644
--- a/src/lib/ecore_win32/ecore_win32_private.h
+++ b/src/lib/ecore_win32/ecore_win32_private.h
@@ -6,16 +6,6 @@
6extern "C" { 6extern "C" {
7#endif 7#endif
8 8
9#ifdef MIN
10# undef MIN
11#endif
12#define MIN(a,b) (((a) < (b)) ? (a) : (b))
13
14#ifdef MAX
15# undef MAX
16#endif
17#define MAX(a,b) (((a) < (b)) ? (b) : (a))
18
19/* logging messages macros */ 9/* logging messages macros */
20extern int _ecore_win32_log_dom_global; 10extern int _ecore_win32_log_dom_global;
21 11
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_dnd.c b/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
index 07eae1f22a..974ec0e4b2 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
@@ -1,9 +1,5 @@
1#include "ecore_xcb_private.h" 1#include "ecore_xcb_private.h"
2 2
3#ifndef MIN
4# define MIN(a, b) (((a) < (b)) ? (a) : (b))
5#endif
6
7/* local structures */ 3/* local structures */
8typedef struct _Version_Cache_Item 4typedef struct _Version_Cache_Item
9{ 5{
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_private.h b/src/lib/ecore_x/xcb/ecore_xcb_private.h
index 61452f2385..d6bb743934 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_private.h
+++ b/src/lib/ecore_x/xcb/ecore_xcb_private.h
@@ -73,14 +73,6 @@ extern int _ecore_xcb_log_dom;
73# define MAXHOSTNAMELEN 256 73# define MAXHOSTNAMELEN 256
74# endif 74# endif
75 75
76# ifndef MIN
77# define MIN(x, y) (((x) > (y)) ? (y) : (x))
78# endif
79
80# ifndef MAX
81# define MAX(a, b) ((a < b) ? b : a)
82# endif
83
84#define CHECK_XCB_CONN \ 76#define CHECK_XCB_CONN \
85 { \ 77 { \
86 if (xcb_connection_has_error(_ecore_xcb_conn)) \ 78 if (xcb_connection_has_error(_ecore_xcb_conn)) \
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 92148e8d50..5bfecbc845 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -130,10 +130,6 @@ EAPI extern int _edje_default_log_dom ;
130#define CLAMP(x, min, max) (((x) > (max)) ? (max) : (((x) < (min)) ? (min) : (x))) 130#define CLAMP(x, min, max) (((x) > (max)) ? (max) : (((x) < (min)) ? (min) : (x)))
131#endif 131#endif
132 132
133#ifndef MIN
134#define MIN(a, b) (((a) < (b)) ? (a) : (b))
135#endif
136
137 133
138#ifdef BUILD_EDJE_FP 134#ifdef BUILD_EDJE_FP
139 135
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 557892570b..ba43c20622 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -54,12 +54,6 @@
54#define OFFSET_HEIGHT 12 54#define OFFSET_HEIGHT 12
55#define OFFSET_BLOCKS 16 55#define OFFSET_BLOCKS 16
56 56
57#undef MIN
58#define MIN(x, y) (((x) < (y)) ? (x) : (y))
59
60#undef MAX
61#define MAX(x, y) (((x) > (y)) ? (x) : (y))
62
63/*---*/ 57/*---*/
64 58
65typedef struct _JPEG_error_mgr *emptr; 59typedef struct _JPEG_error_mgr *emptr;
diff --git a/src/lib/eina/eina_private.h b/src/lib/eina/eina_private.h
index c51d35fae9..810e4b26e5 100644
--- a/src/lib/eina/eina_private.h
+++ b/src/lib/eina/eina_private.h
@@ -25,14 +25,6 @@
25#include "eina_iterator.h" 25#include "eina_iterator.h"
26#include "eina_accessor.h" 26#include "eina_accessor.h"
27 27
28#ifndef MIN
29# define MIN(x, y) (((x) > (y)) ? (y) : (x))
30#endif
31
32#ifndef MAX
33# define MAX(x, y) (((x) > (y)) ? (x) : (y))
34#endif
35
36#ifndef ABS 28#ifndef ABS
37# define ABS(x) ((x) < 0 ? -(x) : (x)) 29# define ABS(x) ((x) < 0 ? -(x) : (x))
38#endif 30#endif
diff --git a/src/lib/eina/eina_str.c b/src/lib/eina/eina_str.c
index 837d61bb70..dcf93c3ca4 100644
--- a/src/lib/eina/eina_str.c
+++ b/src/lib/eina/eina_str.c
@@ -35,7 +35,7 @@
35 35
36#include "eina_private.h" 36#include "eina_private.h"
37#include "eina_str.h" 37#include "eina_str.h"
38 38#include "eina_cpu.h"
39 39
40/*============================================================================* 40/*============================================================================*
41* Local * 41* Local *
diff --git a/src/lib/eina/eina_tiler.c b/src/lib/eina/eina_tiler.c
index 5661a1b782..e8abcdc97b 100644
--- a/src/lib/eina/eina_tiler.c
+++ b/src/lib/eina/eina_tiler.c
@@ -33,6 +33,7 @@
33#include "eina_config.h" 33#include "eina_config.h"
34#include "eina_private.h" 34#include "eina_private.h"
35#include "eina_tiler.h" 35#include "eina_tiler.h"
36#include "eina_cpu.h"
36 37
37/*============================================================================* 38/*============================================================================*
38* Local * 39* Local *
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 101f398b14..90789bb7d9 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -169,10 +169,6 @@ extern const char *_elm_engines[];
169#define ELM_ATSPI_MODE_ON EINA_TRUE 169#define ELM_ATSPI_MODE_ON EINA_TRUE
170 170
171/* convenience macro to compress code and avoid typos */ 171/* convenience macro to compress code and avoid typos */
172#undef MIN
173#define MIN(x, y) (((x) < (y)) ? (x) : (y))
174#undef MAX
175#define MAX(x, y) (((x) > (y)) ? (x) : (y))
176#undef CEIL 172#undef CEIL
177#define CEIL(a) (((a) % 2 != 0) ? ((a) / 2 + 1) : ((a) / 2)) 173#define CEIL(a) (((a) % 2 != 0) ? ((a) / 2 + 1) : ((a) / 2))
178#undef IS_INSIDE 174#undef IS_INSIDE
diff --git a/src/lib/evas/canvas/render2/region.c b/src/lib/evas/canvas/render2/region.c
index 286df409f1..d6974e3b91 100644
--- a/src/lib/evas/canvas/render2/region.c
+++ b/src/lib/evas/canvas/render2/region.c
@@ -84,13 +84,6 @@ struct _Region
84#define PIXREGION_END(reg) PIXREGION_BOX(reg, (reg)->data->num - 1) 84#define PIXREGION_END(reg) PIXREGION_BOX(reg, (reg)->data->num - 1)
85#define PIXREGION_SZOF(n) (sizeof(Region_Data) + ((n) * sizeof(Box))) 85#define PIXREGION_SZOF(n) (sizeof(Region_Data) + ((n) * sizeof(Box)))
86 86
87#ifndef MIN
88# define MIN(a, b) ((a) < (b) ? (a) : (b))
89#endif
90#ifndef MAX
91# define MAX(a, b) ((a) > (b) ? (a) : (b))
92#endif
93
94// r1 and r2 overlap 87// r1 and r2 overlap
95#define OVERLAP(r1, r2) \ 88#define OVERLAP(r1, r2) \
96 (!(((r1)->x2 <= (r2)->x1) || ((r1)->x1 >= (r2)->x2) || \ 89 (!(((r1)->x2 <= (r2)->x1) || ((r1)->x1 >= (r2)->x2) || \
diff --git a/src/lib/evas/include/evas_macros.h b/src/lib/evas/include/evas_macros.h
index c3bc339de5..1deefb88d0 100644
--- a/src/lib/evas/include/evas_macros.h
+++ b/src/lib/evas/include/evas_macros.h
@@ -7,12 +7,6 @@
7#undef SGN 7#undef SGN
8#define SGN(x) (((x) < 0) ? -1 : 1) 8#define SGN(x) (((x) < 0) ? -1 : 1)
9 9
10#undef MIN
11#define MIN(x, y) (((x) < (y)) ? (x) : (y))
12
13#undef MAX
14#define MAX(x, y) (((x) > (y)) ? (x) : (y))
15
16/* clamp b between a and c */ 10/* clamp b between a and c */
17#undef CLAMP 11#undef CLAMP
18#define CLAMP(a,b,c) MIN(MAX((b),(a)),(c)) 12#define CLAMP(a,b,c) MIN(MAX((b),(a)),(c))
diff --git a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
index ac403522f8..f20b8ccaad 100644
--- a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
+++ b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
@@ -37,9 +37,6 @@ struct _Frame_Info
37 Eina_Bool interlace : 1; // interlaced or not 37 Eina_Bool interlace : 1; // interlaced or not
38}; 38};
39 39
40#ifndef MIN
41# define MIN(a, b) (((a) < (b)) ? (a) : (b))
42#endif
43#define LOADERR(x) \ 40#define LOADERR(x) \
44do { \ 41do { \
45 *error = (x); \ 42 *error = (x); \
diff --git a/src/static_libs/rg_etc/rg_etc1.c b/src/static_libs/rg_etc/rg_etc1.c
index 866316793c..cff0094e03 100644
--- a/src/static_libs/rg_etc/rg_etc1.c
+++ b/src/static_libs/rg_etc/rg_etc1.c
@@ -33,8 +33,12 @@ typedef unsigned int uint;
33typedef unsigned int uint32; 33typedef unsigned int uint32;
34typedef unsigned char DATA8; 34typedef unsigned char DATA8;
35 35
36#define MIN(A, B) ((A < B) ? A : B) 36#ifndef MIN
37#define MAX(A, B) ((A > B) ? A : B) 37# define MIN(A, B) ((A < B) ? A : B)
38#endif
39#ifndef MAX
40# define MAX(A, B) ((A > B) ? A : B)
41#endif
38#define CLAMP(Value, Low, High) ((Value < Low) ? Low : ((Value > High) ? High : Value)) 42#define CLAMP(Value, Low, High) ((Value < Low) ? Low : ((Value > High) ? High : Value))
39#define SQUARE(Value) (Value * Value) 43#define SQUARE(Value) (Value * Value)
40 44
diff --git a/src/static_libs/rg_etc/rg_etc2.c b/src/static_libs/rg_etc/rg_etc2.c
index c0c22ea61a..e8a465fc21 100644
--- a/src/static_libs/rg_etc/rg_etc2.c
+++ b/src/static_libs/rg_etc/rg_etc2.c
@@ -92,7 +92,9 @@ static const int kAlphaModifiers[16][8] = {
92#define CLAMP(a) ({ int _b = (a); (((_b) >= 0) ? (((_b) < 256) ? (_b) : 255) : 0); }) 92#define CLAMP(a) ({ int _b = (a); (((_b) >= 0) ? (((_b) < 256) ? (_b) : 255) : 0); })
93 93
94// Simple min 94// Simple min
95#define MIN(a,b) ({ int _z = (a), _y = (b); ((_z <= _y) ? _z : _y); }) 95#ifndef MIN
96# define MIN(a,b) ({ int _z = (a), _y = (b); ((_z <= _y) ? _z : _y); })
97#endif
96 98
97// Write a BGRA value for output to Evas 99// Write a BGRA value for output to Evas
98#define BGRA(r,g,b,a) ((a << 24) | (r << 16) | (g << 8) | b) 100#define BGRA(r,g,b,a) ((a << 24) | (r << 16) | (g << 8) | b)