From 3b63d2d31d0850bd7a81ab9b468218d2c4c461e8 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 18 Oct 2010 22:38:41 +0200
Subject: tmpfiles: integrate kay's directory cleanup code and otherwise beef
 up tmpfiles quite a bit

---
 src/macro.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/macro.h')

diff --git a/src/macro.h b/src/macro.h
index 12ccbb1513..b3da60f13e 100644
--- 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]))
 
+#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__ ({                                                \
-- 
cgit v1.2.3-54-g00ecf