From c5808c56db166528ae7e74cedb51cc466f973b9f Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 9 Sep 2020 16:56:04 +1000 Subject: 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 headers. --- RichString.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'RichString.c') 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 #include #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) { -- cgit v1.2.3