From 1ffe79e67706996ddc62948e7b20f952e5c8fe46 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 25 Dec 2021 09:23:58 +0100 Subject: [PATCH] Fixed warnings for CMake Unity builds * src/cache/ftcbasic.c: Fixed `warning: 'FT_COMPONENT' macro redefined` * src/smooth/ftgrays.c: Fixed `warning: 'TRUNC' macro redefined` --- src/cache/ftcbasic.c | 1 + src/smooth/ftgrays.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c index 1760c5fbd..731038314 100644 --- a/src/cache/ftcbasic.c +++ b/src/cache/ftcbasic.c @@ -26,6 +26,7 @@ #include "ftccback.h" #include "ftcerror.h" +#undef FT_COMPONENT #define FT_COMPONENT cache diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index d982c2820..5d5d016e9 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -333,7 +333,9 @@ typedef ptrdiff_t FT_PtrDist; #define PIXEL_BITS 8 #define ONE_PIXEL ( 1 << PIXEL_BITS ) +#undef TRUNC #define TRUNC( x ) (TCoord)( (x) >> PIXEL_BITS ) +#undef FRACT #define FRACT( x ) (TCoord)( (x) & ( ONE_PIXEL - 1 ) ) #if PIXEL_BITS >= 6