File tree Expand file tree Collapse file tree 2 files changed +5
-0
lines changed Expand file tree Collapse file tree 2 files changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -77,3 +77,6 @@ License Link:
77
77
Patch List:
78
78
* Avoid bool redefinition
79
79
Impacted files: inc/basetype.h
80
+
81
+ * Avoid MIN/MAX redefinition
82
+ Impacted files: inc/enccommon.h
Original file line number Diff line number Diff line change @@ -153,8 +153,10 @@ typedef struct
153
153
154
154
/* General tools */
155
155
#define ABS (x ) ((x) < (0) ? -(x) : (x))
156
+ #if 0 /** PATCH: avoid min/max redefinition */
156
157
#define MAX (a , b ) ((a) > (b) ? (a) : (b))
157
158
#define MIN (a , b ) ((a) < (b) ? (a) : (b))
159
+ #endif
158
160
#define SIGN (a ) ((a) < (0) ? (-1) : (1))
159
161
#define OUT_OF_RANGE (x ,a ,b ) ((((i32)x)<(a)?(1):(0)) || ((x)>(b)?(1):(0)))
160
162
#define CLIP3 (v , min , max ) ((v) < (min) ? (min) : ((v) > (max) ? (max) : (v)))
You can’t perform that action at this time.
0 commit comments