chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ask-password: add basic tty agent
[elogind.git]
/
src
/
macro.h
diff --git
a/src/macro.h
b/src/macro.h
index 12ccbb151341684f6e3f09d9b8a05da6d44d3c00..b3da60f13e51e926c967c5c07c0222080861a801 100644
(file)
--- a/
src/macro.h
+++ b/
src/macro.h
@@
-57,19
+57,29
@@
static inline size_t PAGE_ALIGN(size_t l) {
#define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
#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; \
})
#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; \
})
#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__ ({ \
#define CLAMP(x, low, high) \
__extension__ ({ \