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 /RichString.c | |
| 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 'RichString.c')
| -rw-r--r-- | RichString.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/RichString.c b/RichString.c index 702ab329..95ddf297 100644 --- a/RichString.c +++ b/RichString.c @@ -7,17 +7,13 @@ in the source distribution for its full text. #include "RichString.h" #include "XAlloc.h" +#include "Macros.h" #include <stdlib.h> #include <string.h> #define RICHSTRING_MAXLEN 350 - -#ifndef CLAMP -#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x))) -#endif - #define charBytes(n) (sizeof(CharType) * (n)) static void RichString_extendLen(RichString* this, int len) { |