X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmacro.h;h=996b7c2ed141b42c4f8ce8ea3ffa4881cf1108c1;hp=44b481775d37c5b4c1cb8def72edd7394d241092;hb=a8f11321c209830a35edd0357e8def5d4437d854;hpb=c31e14954b158351b11f886332229a61fff2e5d1

diff --git a/src/macro.h b/src/macro.h
index 44b481775..996b7c2ed 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -27,6 +27,8 @@
 #include <sys/uio.h>
 #include <inttypes.h>
 
+#define PAGE_SIZE 4096
+
 #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
 #define _sentinel_ __attribute__ ((sentinel))
 #define _noreturn_ __attribute__((noreturn))
@@ -43,27 +45,45 @@
 #define _public_ __attribute__ ((visibility("default")))
 #define _hidden_ __attribute__ ((visibility("hidden")))
 #define _weakref_(x) __attribute__((weakref(#x)))
+#define _introspect_(x) __attribute__((section("introspect." x)))
+
+#define XSTRINGIFY(x) #x
+#define STRINGIFY(x) XSTRINGIFY(x)
 
 /* Rounds up */
 static inline size_t ALIGN(size_t l) {
         return ((l + sizeof(void*) - 1) & ~(sizeof(void*) - 1));
 }
 
+static inline size_t PAGE_ALIGN(size_t l) {
+        return ((l + PAGE_SIZE - 1) & ~(PAGE_SIZE -1));
+}
+
 #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
 
+#ifndef MAX
 #define MAX(a,b)                                \
         __extension__ ({                        \
                         typeof(a) _a = (a);     \
                         typeof(b) _b = (b);     \
                         _a > _b ? _a : _b;      \
                 })
+#endif
+
+#define MAX3(a,b,c)                             \
+        MAX(MAX(a,b),c)
 
+#ifndef MIN
 #define MIN(a,b)                                \
         __extension__ ({                        \
                         typeof(a) _a = (a);     \
                         typeof(b) _b = (b);     \
                         _a < _b ? _a : _b;      \
                 })
+#endif
+
+#define MIN3(a,b,c)                             \
+        MIN(MIN(a,b),c)
 
 #define CLAMP(x, low, high)                                             \
         __extension__ ({                                                \