summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-08-15 16:16:30 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2014-08-15 16:59:09 +0200
commitfdcba430aeae442ab0ea12a08d96cfc3d13f57ef (patch)
tree0b5281a02743d490dcef43c0f89ec5edf0569dcf
parent4de120ee442797bc30ecfd25b4d539cac9cb56ce (diff)
macro: const'ify MIN/MAX/... macros
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).
-rw-r--r--src/shared/macro.h52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/shared/macro.h b/src/shared/macro.h
index 5619c32e45..11bd8b3a93 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -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