mirror of
https://github.com/xzeldon/htop.git
synced 2025-07-10 03:04:36 +03:00
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.
This commit is contained in:
@ -27,21 +27,6 @@ in the source distribution for its full text.
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/*
|
||||
* avoid relying on or conflicting with MIN() and MAX() in sys/param.h
|
||||
*/
|
||||
#ifndef MINIMUM
|
||||
#define MINIMUM(x, y) ((x) > (y) ? (y) : (x))
|
||||
#endif
|
||||
|
||||
#ifndef MAXIMUM
|
||||
#define MAXIMUM(x, y) ((x) > (y) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
#ifndef CLAMP
|
||||
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : MAXIMUM(x, low))
|
||||
#endif
|
||||
|
||||
static long fscale;
|
||||
|
||||
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
|
||||
|
@ -38,20 +38,6 @@ typedef struct OpenBSDProcessList_ {
|
||||
|
||||
} OpenBSDProcessList;
|
||||
|
||||
/*
|
||||
* avoid relying on or conflicting with MIN() and MAX() in sys/param.h
|
||||
*/
|
||||
#ifndef MINIMUM
|
||||
#define MINIMUM(x, y) ((x) > (y) ? (y) : (x))
|
||||
#endif
|
||||
|
||||
#ifndef MAXIMUM
|
||||
#define MAXIMUM(x, y) ((x) > (y) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
#ifndef CLAMP
|
||||
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : MAXIMUM(x, low))
|
||||
#endif
|
||||
|
||||
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
|
||||
|
||||
|
Reference in New Issue
Block a user