From 69f439eff387a6ecb52734e400b297a3c85f2285 Mon Sep 17 00:00:00 2001
From: Daniel Lange <DLange@git.local>
Date: Tue, 21 Sep 2021 08:35:19 +0200
Subject: New upstream version 3.1.0

---
 Macros.h | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

(limited to 'Macros.h')

diff --git a/Macros.h b/Macros.h
index 64aaefa..5e8891a 100644
--- a/Macros.h
+++ b/Macros.h
@@ -4,27 +4,31 @@
 #include <assert.h> // IWYU pragma: keep
 
 #ifndef MINIMUM
-#define MINIMUM(a, b)             ((a) < (b) ? (a) : (b))
+#define MINIMUM(a, b)                  ((a) < (b) ? (a) : (b))
 #endif
 
 #ifndef MAXIMUM
-#define MAXIMUM(a, b)             ((a) > (b) ? (a) : (b))
+#define MAXIMUM(a, b)                  ((a) > (b) ? (a) : (b))
 #endif
 
 #ifndef CLAMP
-#define CLAMP(x, low, high)       (assert((low) <= (high)), ((x) > (high)) ? (high) : MAXIMUM(x, low))
+#define CLAMP(x, low, high)            (assert((low) <= (high)), ((x) > (high)) ? (high) : MAXIMUM(x, low))
 #endif
 
 #ifndef ARRAYSIZE
-#define ARRAYSIZE(x)              (sizeof(x) / sizeof((x)[0]))
+#define ARRAYSIZE(x)                   (sizeof(x) / sizeof((x)[0]))
 #endif
 
 #ifndef SPACESHIP_NUMBER
-#define SPACESHIP_NUMBER(a, b)    (((a) > (b)) - ((a) < (b)))
+#define SPACESHIP_NUMBER(a, b)         (((a) > (b)) - ((a) < (b)))
 #endif
 
 #ifndef SPACESHIP_NULLSTR
-#define SPACESHIP_NULLSTR(a, b)   strcmp((a) ? (a) : "", (b) ? (b) : "")
+#define SPACESHIP_NULLSTR(a, b)        strcmp((a) ? (a) : "", (b) ? (b) : "")
+#endif
+
+#ifndef SPACESHIP_DEFAULTSTR
+#define SPACESHIP_DEFAULTSTR(a, b, s)  strcmp((a) ? (a) : (s), (b) ? (b) : (s))
 #endif
 
 #ifdef  __GNUC__  // defined by GCC and Clang
@@ -33,6 +37,7 @@
 #define ATTR_NONNULL                    __attribute__((nonnull))
 #define ATTR_NORETURN                   __attribute__((noreturn))
 #define ATTR_UNUSED                     __attribute__((unused))
+#define ATTR_MALLOC                     __attribute__((malloc))
 
 #else /* __GNUC__ */
 
@@ -40,13 +45,26 @@
 #define ATTR_NONNULL
 #define ATTR_NORETURN
 #define ATTR_UNUSED
+#define ATTR_MALLOC
 
 #endif /* __GNUC__ */
 
+#ifdef HAVE_ATTR_ALLOC_SIZE
+
+#define ATTR_ALLOC_SIZE1(a)             __attribute__((alloc_size (a)))
+#define ATTR_ALLOC_SIZE2(a, b)          __attribute__((alloc_size (a, b)))
+
+#else
+
+#define ATTR_ALLOC_SIZE1(a)
+#define ATTR_ALLOC_SIZE2(a, b)
+
+#endif /* HAVE_ATTR_ALLOC_SIZE */
+
 // ignore casts discarding const specifier, e.g.
 //     const char []     ->  char * / void *
 //     const char *[2]'  ->  char *const *
-#ifdef __clang__
+#if defined(__clang__)
 #define IGNORE_WCASTQUAL_BEGIN  _Pragma("clang diagnostic push") \
                                 _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
 #define IGNORE_WCASTQUAL_END    _Pragma("clang diagnostic pop")
@@ -59,4 +77,9 @@
 #define IGNORE_WCASTQUAL_END
 #endif
 
+/* This subtraction is used by Linux / NetBSD / OpenBSD for calculation of CPU usage items. */
+static inline unsigned long long saturatingSub(unsigned long long a, unsigned long long b) {
+   return a > b ? a - b : 0;
+}
+
 #endif
-- 
cgit v1.2.3