diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2018-04-05 08:24:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 08:24:28 -0700 |
| commit | 86f418f0bd196ba84ab702410500271a4f8b0c33 (patch) | |
| tree | e0d2fa14131785ad8ea63360ec70666c43e58db0 /src/vm/proftoeeinterfaceimpl.cpp | |
| parent | f2aa806de27cd75fc1273ebea7f1c41a670b1f40 (diff) | |
| download | coreclr-86f418f0bd196ba84ab702410500271a4f8b0c33.tar.gz coreclr-86f418f0bd196ba84ab702410500271a4f8b0c33.tar.bz2 coreclr-86f418f0bd196ba84ab702410500271a4f8b0c33.zip | |
Rename conflicting definitions VER_MAJOR/MINORVERSION macros (#17364)
* Rename conflicting definitions of VER_MAJOR/MINORVERSION
These macros are defined by Windows SDK. They were overload to mean CLR version
that was causing interesting redefinition issues.
* Delete workaround for redefined Windows SDK macros
* Delete ProjectN version
* Delete dead code
Diffstat (limited to 'src/vm/proftoeeinterfaceimpl.cpp')
| -rw-r--r-- | src/vm/proftoeeinterfaceimpl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vm/proftoeeinterfaceimpl.cpp b/src/vm/proftoeeinterfaceimpl.cpp index 04330a26e0..2830089fee 100644 --- a/src/vm/proftoeeinterfaceimpl.cpp +++ b/src/vm/proftoeeinterfaceimpl.cpp @@ -8849,16 +8849,16 @@ HRESULT ProfToEEInterfaceImpl::GetRuntimeInformation(USHORT * pClrInstanceId, } if (pMajorVersion != NULL) - *pMajorVersion = VER_MAJORVERSION; + *pMajorVersion = CLR_MAJOR_VERSION; if (pMinorVersion != NULL) - *pMinorVersion = VER_MINORVERSION; + *pMinorVersion = CLR_MINOR_VERSION; if (pBuildNumber != NULL) - *pBuildNumber = VER_PRODUCTBUILD; + *pBuildNumber = CLR_BUILD_VERSION; if (pQFEVersion != NULL) - *pQFEVersion = VER_PRODUCTBUILD_QFE; + *pQFEVersion = CLR_BUILD_VERSION_QFE; return S_OK; } |