Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Rename conflicting definitions VER_MAJOR/MINORVERSION macros #17364

Merged
merged 4 commits into from
Apr 5, 2018

Conversation

jkotas
Copy link
Member

@jkotas jkotas commented Mar 31, 2018

These macros are defined by Windows SDK. They were overload to mean CLR version that was causing interesting redefinition issues.

@jkotas
Copy link
Member Author

jkotas commented Mar 31, 2018

cc @ericeil Noticed this while looking at impact of your PR.

@jkotas jkotas force-pushed the ver branch 2 times, most recently from a58d6bd to d960439 Compare March 31, 2018 07:35
These macros are defined by Windows SDK. They were overload to mean CLR version
that was causing interesting redefinition issues.
@janvorli
Copy link
Member

janvorli commented Apr 4, 2018

@dotnet-bot test Ubuntu arm Cross Checked Innerloop Build and Test

@janvorli
Copy link
Member

janvorli commented Apr 4, 2018

@dotnet-bot test Windows_NT arm Cross Checked Innerloop Build and Test

@janvorli
Copy link
Member

janvorli commented Apr 4, 2018

@dotnet-bot test Windows_NT arm64 Cross Checked Innerloop Build and Test

@janvorli
Copy link
Member

janvorli commented Apr 4, 2018

@dotnet-bot test Ubuntu x64 Checked Innerloop Build and Test

@jkotas jkotas merged commit 86f418f into dotnet:master Apr 5, 2018
@jkotas jkotas deleted the ver branch April 11, 2018 22:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants