diff options
| author | Nathan Scott <nathans@redhat.com> | 2020-09-09 16:56:04 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@redhat.com> | 2020-09-09 16:56:04 +1000 |
| commit | c5808c56db166528ae7e74cedb51cc466f973b9f (patch) | |
| tree | b0364c031595aacc8db222885bebb8390983429e /darwin | |
| parent | 8ec5d4a3a07fe9a3c556a4abeac6645a7bb2235e (diff) | |
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.
Diffstat (limited to 'darwin')
| -rw-r--r-- | darwin/Platform.c | 4 | ||||
| -rw-r--r-- | darwin/Platform.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/darwin/Platform.c b/darwin/Platform.c index f8007d82..a8ca45b2 100644 --- a/darwin/Platform.c +++ b/darwin/Platform.c @@ -22,10 +22,6 @@ in the source distribution for its full text. #include <stdlib.h> -#ifndef CLAMP -#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x))) -#endif - ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; const SignalItem Platform_signals[] = { diff --git a/darwin/Platform.h b/darwin/Platform.h index 5ce23684..7dd4ae60 100644 --- a/darwin/Platform.h +++ b/darwin/Platform.h @@ -14,10 +14,6 @@ in the source distribution for its full text. #include "BatteryMeter.h" #include "DarwinProcess.h" -#ifndef CLAMP -#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x))) -#endif - extern ProcessField Platform_defaultFields[]; extern const SignalItem Platform_signals[]; |