diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2013-06-04 12:06:38 -0400 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2013-06-04 12:06:38 -0400 |
commit | 321aee618d65ae1c1419a1fcc11fdfd068995d38 (patch) | |
tree | aae8847c006d4cb80696ebc5a63937c08a9628e6 /src/libudev/macro.h | |
parent | fe41df03135a49f13ceda838ea453e9cb848ad39 (diff) |
src/libudev/{exit-status,macro,missing}.h: bring in line with upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/libudev/macro.h')
-rw-r--r-- | src/libudev/macro.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libudev/macro.h b/src/libudev/macro.h index 4089003e64..bfe03f2ae0 100644 --- a/src/libudev/macro.h +++ b/src/libudev/macro.h @@ -114,6 +114,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { _a < _b ? _a : _b; \ }) +#ifndef CLAMP #define CLAMP(x, low, high) \ __extension__ ({ \ typeof(x) _x = (x); \ @@ -121,6 +122,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { typeof(high) _high = (high); \ ((_x > _high) ? _high : ((_x < _low) ? _low : _x)); \ }) +#endif #define assert_se(expr) \ do { \ |