X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fmacro.h;h=dfbc20142f753172ee8708f5e5aa94eca27fa66b;hb=127b55d5a49e8e534e12107fc5d5a684c390d7aa;hp=fd3762eed4aae50976bff45148966dbde4cb6764;hpb=80514f9c9bb86dbba761e4b026e5d62156ea112c;p=elogind.git diff --git a/src/shared/macro.h b/src/shared/macro.h index fd3762eed..dfbc20142 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -30,7 +30,6 @@ #define _printf_(a,b) __attribute__ ((format (printf, a, b))) #define _alloc_(...) __attribute__ ((alloc_size(__VA_ARGS__))) #define _sentinel_ __attribute__ ((sentinel)) -#define _noreturn_ __attribute__((noreturn)) #define _unused_ __attribute__ ((unused)) #define _destructor_ __attribute__ ((destructor)) #define _pure_ __attribute__ ((pure)) @@ -118,6 +117,13 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { _a < _b ? _a : _b; \ }) +#define LESS_BY(A,B) \ + __extension__ ({ \ + typeof(A) _A = (A); \ + typeof(B) _B = (B); \ + _A > _B ? _A - _B : 0; \ + }) + #ifndef CLAMP #define CLAMP(x, low, high) \ __extension__ ({ \ @@ -300,5 +306,28 @@ do { \ _found; \ }) +/* Define C11 thread_local attribute even on older gcc compiler + * version */ +#ifndef thread_local +/* + * Don't break on glibc < 2.16 that doesn't define __STDC_NO_THREADS__ + * see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53769 + */ +#if __STDC_VERSION__ >= 201112L && !(defined(__STDC_NO_THREADS__) || (defined(__GNU_LIBRARY__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 16)) +#define thread_local _Thread_local +#else +#define thread_local __thread +#endif +#endif + +/* Define C11 noreturn without and even on older gcc + * compiler versions */ +#ifndef noreturn +#if __STDC_VERSION__ >= 201112L +#define noreturn _Noreturn +#else +#define noreturn __attribute__((noreturn)) +#endif +#endif #include "log.h"