Skip to content
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.

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

X11: Fix vformat ambiguous int types for GCC 10 (again) #77957

Merged
merged 1 commit into from
Jun 7, 2023

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Jun 7, 2023

Fixup after #75099.

Same issue as we had to fix with 9dc2869. I don't reproduce it locally with GCC 12, I wonder if there's a way we can ensure to catch this from CI. Or whether we should add relevant definitions to disambiguate. @bruvzg

Edit: Ah it's failing specifically on x86_32 builds, which we don't test as often.

@akien-mga akien-mga added this to the 4.1 milestone Jun 7, 2023
@akien-mga akien-mga requested a review from a team as a code owner June 7, 2023 12:59
Comment on lines 869 to +872
"\n Major opcode of failed request: %d"
"\n Serial number of failed request: %d"
"\n Current serial number in output stream: %d",
String::utf8(message), error->request_code, error->minor_code, error->serial));
String::utf8(message), (uint64_t)error->request_code, (uint64_t)error->minor_code, (uint64_t)error->serial));
Copy link
Member Author

Choose a reason for hiding this comment

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

BTW, I'm not sure the descriptions are correct, comparing with https://www.x.org/releases/current/doc/man/man3/XErrorEvent.3.xhtml

request_code is indeed the major opcode, but are the description for the last two accurate?
"Serial number of failed request" seems to be the description of serial but we match it with minor_code.
CC @mxnemu

Copy link

Choose a reason for hiding this comment

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

I'm a bit out of it since I wrote it, but yeah it seems like the 2nd line should rather say "\n Minor opcode of failed request: %d"

@akien-mga akien-mga merged commit a69730f into godotengine:master Jun 7, 2023
@akien-mga akien-mga deleted the x11-fix-vformat-gcc10 branch June 7, 2023 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants