From c5808c56db166528ae7e74cedb51cc466f973b9f Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Wed, 9 Sep 2020 16:56:04 +1000
Subject: Consolidate repeated macro definitions into one header

The MIN, MAX, CLAMP, MINIMUM, and MAXIMUM macros appear
throughout the codebase with many re-definitions.  Make
a single copy of each in a common header file, and use
the BSD variants of MINIMUM/MAXIMUM due to conflicts in
the system <sys/param.h> headers.
---
 CPUMeter.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'CPUMeter.h')

diff --git a/CPUMeter.h b/CPUMeter.h
index 2caa8291..d66eefbb 100644
--- a/CPUMeter.h
+++ b/CPUMeter.h
@@ -24,13 +24,6 @@ typedef enum {
 
 extern int CPUMeter_attributes[];
 
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
 extern MeterClass CPUMeter_class;
 
 extern MeterClass AllCPUsMeter_class;
-- 
cgit v1.2.3