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.

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

Jump to bottom

[C++] Fix Windows min/max macro collision #3491

Merged
merged 1 commit into from
Jan 23, 2022
Merged

[C++] Fix Windows min/max macro collision #3491

merged 1 commit into from
Jan 23, 2022

Conversation

jcking
Copy link
Collaborator

@jcking jcking commented Jan 14, 2022

Set WIN32_LEAN_AND_MEAN and NOMINMAX when including a Windows API related header in support/Guid.cpp. This resolves #3489. Additionally I updated the macros to be prefixed with ANTLR4CPP_ which is best practice for public headers.

@jcking
Copy link
Collaborator Author

jcking commented Jan 14, 2022

@mike-lischke

mike-lischke
mike-lischke approved these changes Jan 23, 2022
View reviewed changes
Copy link
Member

@mike-lischke mike-lischke left a comment

Choose a reason for hiding this comment

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

@parrt This patch can be merged.

@parrt parrt added this to the 4.10 milestone Jan 23, 2022
@parrt parrt merged commit 0782e21 into antlr:master Jan 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mike-lischke mike-lischke mike-lischke approved these changes

Assignees
No one assigned
Labels
target:cpp
Projects
None yet
Milestone
4.10
Development

Successfully merging this pull request may close these issues.

[Cpp Runtime] MSVC: std::min in Guid.cpp needs NOMINMAX macro for compilation
3 participants
@jcking @mike-lischke @parrt