Skip to content

Fix macro conflict for USE_FREETYPE=1 #22572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix macro conflict for USE_FREETYPE=1 #22572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/ports/freetype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the definition - do the uses not need to be updated too? I'm just confused how this works.

Copy link
Author

@jeroen jeroen Sep 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure why that was archived. @sbc100 did we plan to use upstream perhaps?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should look into upgrading our version of freetype. I'll take a look.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be done in #22585

#endif


Expand Down
Loading