summaryrefslogtreecommitdiffstats
path: root/CPUMeter.c
diff options
context:
space:
mode:
authorNathan Scott <nathans@redhat.com>2020-09-09 16:56:04 +1000
committerNathan Scott <nathans@redhat.com>2020-09-09 16:56:04 +1000
commitc5808c56db166528ae7e74cedb51cc466f973b9f (patch)
treeb0364c031595aacc8db222885bebb8390983429e /CPUMeter.c
parent8ec5d4a3a07fe9a3c556a4abeac6645a7bb2235e (diff)
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.
Diffstat (limited to 'CPUMeter.c')
-rw-r--r--CPUMeter.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/CPUMeter.c b/CPUMeter.c
index b6e4deab..df5585e9 100644
--- a/CPUMeter.c
+++ b/CPUMeter.c
@@ -20,13 +20,6 @@ int CPUMeter_attributes[] = {
CPU_NICE, CPU_NORMAL, CPU_SYSTEM, CPU_IRQ, CPU_SOFTIRQ, CPU_STEAL, CPU_GUEST, CPU_IOWAIT
};
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
static void CPUMeter_init(Meter* this) {
int cpu = this->param;
if (this->pl->cpuCount > 1) {

© 2014-2024 Faster IT GmbH | imprint | privacy policy