commit 4eb6cb8818057a022f97176b53738ee3098c8eb6
author Alexander Borsuk <me@alex.bio> Sat Dec 25 09:23:58 2021 +0100
committer Werner Lemberg <wl@gnu.org> Mon Dec 27 07:48:04 2021 +0100
tree 0a1fffe45c0e7233d2cd947e8254d79181d1104e
parent 4f35711844eb5931833467fe15568aed7b38a381

Fix warnings for CMake Unity builds.

* src/cache/ftcbasic.c (FT_COMPONENT): Undefine macro before redefinition.
* src/smooth/ftgrays.c (TRUNC, FRACT): Ditto.

src/cache/ftcbasic.c

diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c
index 1760c5f..7310383 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
 
 

src/smooth/ftgrays.c

diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index d982c28..5d5d016 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -333,7 +333,9 @@
 #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