Skip to content

Commit 90ee86d

Browse files
committed
lib: vc8000nanoe: avoid min/max redefinition
Avoid min/max redefinition. Signed-off-by: Hugues Fruchet <[email protected]>
1 parent 9d0c2e7 commit 90ee86d

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

lib/vc8000nanoe/README.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,6 @@ License Link:
7777
Patch List:
7878
* Avoid bool redefinition
7979
Impacted files: inc/basetype.h
80+
81+
* Avoid MIN/MAX redefinition
82+
Impacted files: inc/enccommon.h

lib/vc8000nanoe/inc/enccommon.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ typedef struct
153153

154154
/* General tools */
155155
#define ABS(x) ((x) < (0) ? -(x) : (x))
156+
#if 0 /** PATCH: avoid min/max redefinition */
156157
#define MAX(a, b) ((a) > (b) ? (a) : (b))
157158
#define MIN(a, b) ((a) < (b) ? (a) : (b))
159+
#endif
158160
#define SIGN(a) ((a) < (0) ? (-1) : (1))
159161
#define OUT_OF_RANGE(x,a,b) ((((i32)x)<(a)?(1):(0)) || ((x)>(b)?(1):(0)))
160162
#define CLIP3(v, min, max) ((v) < (min) ? (min) : ((v) > (max) ? (max) : (v)))

0 commit comments

Comments
 (0)