shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 11:55:23 +03:00
Code

macro: const'ify MIN/MAX/... macros

Browse Source 
We must add 'const' to local variables in statement-expressions to
guarantee that the macros can produce constant-expressions if given such.
GCC seems to ignore this, but LLVM/clang requires it (understandably).
This commit is contained in:
David Herrmann 2014-08-15 16:16:30 +02:00
parent 4de120ee44
commit fdcba430ae
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/shared/macro.h
View File

@ -133,46 +133,46 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
})
#undef MAX
#define MAX(a,b) \
__extension__ ({ \
typeof(a) _a = (a); \
typeof(b) _b = (b); \
_a > _b ? _a : _b; \
#define MAX(a,b) \
__extension__ ({ \
const typeof(a) _a = (a); \
const typeof(b) _b = (b); \
_a > _b ? _a : _b; \
})
#define MAX3(x,y,z) \
__extension__ ({ \
typeof(x) _c = MAX(x,y); \
MAX(_c, z); \
#define MAX3(x,y,z) \
__extension__ ({ \
const typeof(x) _c = MAX(x,y); \
MAX(_c, z); \
})
#undef MIN
#define MIN(a,b) \
__extension__ ({ \
typeof(a) _a = (a); \
typeof(b) _b = (b); \
_a < _b ? _a : _b; \
#define MIN(a,b) \
__extension__ ({ \
const typeof(a) _a = (a); \
const typeof(b) _b = (b); \
_a < _b ? _a : _b; \
})
#define MIN3(x,y,z) \
__extension__ ({ \
typeof(x) _c = MIN(x,y); \
MIN(_c, z); \
#define MIN3(x,y,z) \
__extension__ ({ \
const typeof(x) _c = MIN(x,y); \
MIN(_c, z); \
})
#define LESS_BY(A,B) \
__extension__ ({ \
typeof(A) _A = (A); \
typeof(B) _B = (B); \
_A > _B ? _A - _B : 0; \
#define LESS_BY(A,B) \
__extension__ ({ \
const typeof(A) _A = (A); \
const typeof(B) _B = (B); \
_A > _B ? _A - _B : 0; \
})
#ifndef CLAMP
#define CLAMP(x, low, high) \
__extension__ ({ \
typeof(x) _x = (x); \
typeof(low) _low = (low); \
typeof(high) _high = (high); \
const typeof(x) _x = (x); \
const typeof(low) _low = (low); \
const typeof(high) _high = (high); \
((_x > _high) ? _high : ((_x < _low) ? _low : _x)); \
})
#endif