New upstream version 3.0.2upstream/3.0.2

1 files changed, 1 insertions, 25 deletions

diff --git a/Header.c b/Header.c
index c8cfaab..d2f3b88 100644
--- a/Header.c
+++ b/Header.c
@@ -16,30 +16,6 @@ in the source distribution for its full text.
 #include <string.h>
 #include <stdlib.h>
 
-/*{
-#include "Meter.h"
-#include "Settings.h"
-#include "Vector.h"
-
-typedef struct Header_ {
-   Vector** columns;
-   Settings* settings;
-   struct ProcessList_* pl;
-   int nrColumns;
-   int pad;
-   int height;
-} Header;
-
-}*/
-
-#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));
    this->columns = xCalloc(nrColumns, sizeof(Vector*));
@@ -211,7 +187,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;