X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fmacro.h;h=5619c32e457ba792172fa29badabeb50dbda6f8c;hb=3a43da2832dc5360a638d043f469a6dcbe025582;hp=d53b07fea5cdc02c45a7d5367df8cb76ec96e574;hpb=dc36d78e116a7ce4a119a527299785025c925679;p=elogind.git

diff --git a/src/shared/macro.h b/src/shared/macro.h
index d53b07fea..5619c32e4 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -63,6 +63,10 @@
         _Pragma("GCC diagnostic push");                                 \
         _Pragma("GCC diagnostic ignored \"-Wnonnull\"")
 
+#define DISABLE_WARNING_SHADOW                                          \
+        _Pragma("GCC diagnostic push");                                 \
+        _Pragma("GCC diagnostic ignored \"-Wshadow\"")
+
 #define REENABLE_WARNING                                                \
         _Pragma("GCC diagnostic pop")
 
@@ -100,6 +104,19 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
 
 #define ALIGN_TO_PTR(p, ali) ((void*) ALIGN_TO((unsigned long) p, ali))
 
+/* align to next higher power-of-2 (except for: 0 => 0, overflow => 0) */
+static inline unsigned long ALIGN_POWER2(unsigned long u) {
+        /* clz(0) is undefined */
+        if (u == 1)
+                return 1;
+
+        /* left-shift overflow is undefined */
+        if (__builtin_clzl(u - 1UL) < 1)
+                return 0;
+
+        return 1UL << (sizeof(u) * 8 - __builtin_clzl(u - 1UL));
+}
+
 #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
 
 /*
@@ -137,6 +154,12 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
                         _a < _b ? _a : _b;      \
                 })
 
+#define MIN3(x,y,z)                              \
+        __extension__ ({                         \
+                        typeof(x) _c = MIN(x,y); \
+                        MIN(_c, z);              \
+                })
+
 #define LESS_BY(A,B)                            \
         __extension__ ({                        \
                         typeof(A) _A = (A);     \
@@ -218,6 +241,9 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
 #define PTR_TO_UINT64(p) ((uint64_t) ((uintptr_t) (p)))
 #define UINT64_TO_PTR(u) ((void *) ((uintptr_t) (u)))
 
+#define PTR_TO_SIZE(p) ((size_t) ((uintptr_t) (p)))
+#define SIZE_TO_PTR(u) ((void *) ((uintptr_t) (u)))
+
 #define memzero(x,l) (memset((x), 0, (l)))
 #define zero(x) (memzero(&(x), sizeof(x)))