X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fmacro.h;h=e5c33ce5617653861dc9f53acae848709c75a864;hb=907809fc6a9867869b8a237663af2eda335d333e;hp=055919048c90d8c203baf1ae1d8913d2c002714a;hpb=e3ded78be7df143ba780dd55ca8897fdddd67460;p=elogind.git diff --git a/src/shared/macro.h b/src/shared/macro.h index 055919048..e5c33ce56 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -92,6 +92,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { #define MIN3(a,b,c) \ MIN(MIN(a,b),c) +#ifndef CLAMP #define CLAMP(x, low, high) \ __extension__ ({ \ typeof(x) _x = (x); \ @@ -99,6 +100,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 { \ @@ -203,6 +205,7 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) { #define _cleanup_set_free_ __attribute__((cleanup(set_freep))) #define _cleanup_set_free_free_ __attribute__((cleanup(set_free_freep))) #define _cleanup_strv_free_ __attribute__((cleanup(strv_freep))) +#define _cleanup_journal_close_ __attribute__((cleanup(journal_closep))) #define VA_FORMAT_ADVANCE(format, ap) \ do { \