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.
---
 TasksMeter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'TasksMeter.c')

diff --git a/TasksMeter.c b/TasksMeter.c
index 49816bdb..0b37ab27 100644
--- a/TasksMeter.c
+++ b/TasksMeter.c
@@ -20,7 +20,7 @@ static void TasksMeter_updateValues(Meter* this, char* buffer, int len) {
    this->values[0] = pl->kernelThreads;
    this->values[1] = pl->userlandThreads;
    this->values[2] = pl->totalTasks - pl->kernelThreads - pl->userlandThreads;
-   this->values[3] = MIN(pl->runningTasks, pl->cpuCount);
+   this->values[3] = MINIMUM(pl->runningTasks, pl->cpuCount);
    if (pl->totalTasks > this->total) {
       this->total = pl->totalTasks;
    }
-- 
cgit v1.2.3