From 9e5b0c84c5abda3203c8aa63f06452317dc994ef Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Sun, 15 Sep 2024 15:58:50 +0200 Subject: [PATCH] Freetype: rename conflicting macro Do not publicly export TYPEOF macro which conflicts with other libraries. Backport of https://github.com/freetype/freetype/commit/5931268 Fixes #22571 --- tools/ports/freetype.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ports/freetype.py b/tools/ports/freetype.py index b668856ac0736..cdedf427e8286 100644 --- a/tools/ports/freetype.py +++ b/tools/ports/freetype.py @@ -488,9 +488,9 @@ def show(): #if ( __GNUC__ >= 2 || \ defined( __IBM__TYPEOF__ ) || \ ( __SUNPRO_C >= 0x5110 && !__STDC__ ) ) -#define TYPEOF( type ) (__typeof__ (type)) +#define FT_TYPEOF( type ) (__typeof__ (type)) #else -#define TYPEOF( type ) /* empty */ +#define FT_TYPEOF( type ) /* empty */ #endif