Fix macro conflict for USE_FREETYPE=1 #22572
Conversation
Do not publicly export TYPEOF macro which conflicts with other libraries. Backport of freetype/freetype@5931268 Fixes #22571
jeroen
changed the title
| #define FT_TYPEOF( type ) (__typeof__ (type)) | ||
| #else | ||
| #define TYPEOF( type ) /* empty */ | ||
| #define FT_TYPEOF( type ) /* empty */ |
There was a problem hiding this comment.
This changes the definition - do the uses not need to be updated too? I'm just confused how this works.
There was a problem hiding this comment.
Yes maybe you are right. I assumed this file was just the shipped header, but it is also used during the build.
Given that you own the repo, an easier solution is to cherry-pick emscripten-ports/FreeType@5931268eec into the git tag version_1 that we pull in here. Not sure why you archived that repo, but including that one commit would be a big improvement for us (and harmless for others).
There was a problem hiding this comment.
Hmm, I'm not sure why that was archived. @sbc100 did we plan to use upstream perhaps?
There was a problem hiding this comment.
I think we should look into upgrading our version of freetype. I'll take a look.
3 participants
Basically backport of freetype/freetype@5931268 / emscripten-ports/FreeType@5931268eec
We want to avoid publicly exporting the
TYPEOFmacro which conflicts with other libraries. . IIUC the header here is the one that gets included in the compiler with-s USE_FREETYPE=1? This should fix #22571