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/dlls/mscoree | |
| 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/dlls/mscoree')
| -rw-r--r-- | src/dlls/mscoree/mscoree.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dlls/mscoree/mscoree.cpp b/src/dlls/mscoree/mscoree.cpp index 36b22f2a57..762926e641 100644 --- a/src/dlls/mscoree/mscoree.cpp +++ b/src/dlls/mscoree/mscoree.cpp @@ -601,7 +601,7 @@ __out_ecount_z_opt(cchBuffer) LPWSTR pBuffer, *pBuffer = W('\0'); } -#define VERSION_NUMBER_NOSHIM W("v") QUOTE_MACRO_L(VER_MAJORVERSION.VER_MINORVERSION.VER_PRODUCTBUILD) +#define VERSION_NUMBER_NOSHIM W("v") QUOTE_MACRO_L(CLR_MAJOR_VERSION.CLR_MINOR_VERSION.CLR_BUILD_VERSION) DWORD length = (DWORD)(wcslen(VERSION_NUMBER_NOSHIM) + 1); if (length > cchBuffer) |