diff options
author | Daniel Lange <DLange@git.local> | 2020-09-15 08:00:00 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2020-09-15 08:00:00 +0200 |
commit | f80394a20254938142011855f2954b3f63fe5909 (patch) | |
tree | b777de460977f21a6257540d6a687c86882850dc /Header.c | |
parent | 59eeadec918a955b40427a1b012992161050c939 (diff) | |
download | debian_htop-f80394a20254938142011855f2954b3f63fe5909.tar.gz debian_htop-f80394a20254938142011855f2954b3f63fe5909.tar.bz2 debian_htop-f80394a20254938142011855f2954b3f63fe5909.zip |
New upstream version 3.0.2upstream/3.0.2
Diffstat (limited to 'Header.c')
-rw-r--r-- | Header.c | 26 |
1 files changed, 1 insertions, 25 deletions
@@ -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; |