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.

1 files changed, 1 insertions, 8 deletions

diff --git a/Header.c b/Header.c
index ffd31a24..574165a6 100644
--- a/Header.c
+++ b/Header.c
@@ -16,14 +16,7 @@ in the source distribution for its full text.
 #include <string.h>
 #include <stdlib.h>
 
-
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
-#ifndef Header_forEachColumn
 #define Header_forEachColumn(this_, i_) for (int (i_)=0; (i_) < (this_)->nrColumns; ++(i_))
-#endif
 
 Header* Header_new(struct ProcessList_* pl, Settings* settings, int nrColumns) {
    Header* this = xCalloc(1, sizeof(Header));
@@ -196,7 +189,7 @@ int Header_calculateHeight(Header* this) {
          Meter* meter = (Meter*) Vector_get(meters, i);
          height += meter->h;
       }
-      maxHeight = MAX(maxHeight, height);
+      maxHeight = MAXIMUM(maxHeight, height);
    }
    this->height = maxHeight;
    this->pad = pad;