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

Fix macro handling to avoid conflicts with Win32 API headers #541

Merged
merged 1 commit into from
Jan 19, 2025

Conversation

kazssym
Copy link
Contributor

@kazssym kazssym commented Dec 25, 2024

Adjust macro definitions to prevent conflicts with Microsoft Win32 API headers by using push and pop macro directives.

Fixes #468

@kazssym
Copy link
Contributor Author

kazssym commented Dec 25, 2024

This PR changes the SODEBUGERROR_STORE_ERROR_DEF macro's usage as the marker to pop the definition of ERROR. Due to the language spec, it could not be used to restore the original definition at all.

@VolkerEnderlein VolkerEnderlein merged commit b1a082c into coin3d:master Jan 19, 2025
5 checks passed
@VolkerEnderlein
Copy link
Collaborator

Thanks for reworking the prvious PR. Your contribution to Coin development is highly appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

<Inventor/errors/SoDebugErrors.h> leaves macro ERROR defined to an undeclared symbol
2 participants