diff options
author | Daniel Lange <DLange@git.local> | 2020-09-15 08:00:01 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2020-09-15 08:00:01 +0200 |
commit | 8e8165109aca4e3c2a8558653df088d674061c78 (patch) | |
tree | d68c91ced3a78c65be9ae262ea84676e73cac68d /Header.c | |
parent | e9302ddfaeaad62b12bdd352958fb194a26f3c74 (diff) | |
parent | f80394a20254938142011855f2954b3f63fe5909 (diff) | |
download | debian_htop-8e8165109aca4e3c2a8558653df088d674061c78.tar.gz debian_htop-8e8165109aca4e3c2a8558653df088d674061c78.tar.bz2 debian_htop-8e8165109aca4e3c2a8558653df088d674061c78.zip |
Update upstream source from tag 'upstream/3.0.2'
Update to upstream version '3.0.2'
with Debian dir 26e1b8d7612e50e81b8325506c1ce54f71cba270
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; |