diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-02-28 17:45:12 -0800 |
|---|---|---|
| committer | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-02-28 17:49:39 -0800 |
| commit | 448a91d9437ea94387cda57ebe5fa670dfc9ae14 (patch) | |
| tree | dd730133ae393a97079c348b13328240f68b4ffc /src/vm/methodtablebuilder.cpp | |
| parent | 7493d29441180fa1ffdafd77186f3beebee93515 (diff) | |
| download | coreclr-448a91d9437ea94387cda57ebe5fa670dfc9ae14.tar.gz coreclr-448a91d9437ea94387cda57ebe5fa670dfc9ae14.tar.bz2 coreclr-448a91d9437ea94387cda57ebe5fa670dfc9ae14.zip | |
Replace ambiguous _WIN64 and BIT64 with _TARGET_64BIT_ macro
Diffstat (limited to 'src/vm/methodtablebuilder.cpp')
| -rw-r--r-- | src/vm/methodtablebuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm/methodtablebuilder.cpp b/src/vm/methodtablebuilder.cpp index 179a42da53..6464e5849e 100644 --- a/src/vm/methodtablebuilder.cpp +++ b/src/vm/methodtablebuilder.cpp @@ -8087,17 +8087,17 @@ VOID MethodTableBuilder::PlaceInstanceFields(MethodTable ** pByValueClassCach // value classes could have GC pointers in them, which need to be pointer-size aligned // so do this if it has not been done already -#if !defined(_WIN64) && (DATA_ALIGNMENT > 4) +#if !defined(_TARGET_64BIT_) && (DATA_ALIGNMENT > 4) dwCumulativeInstanceFieldPos = (DWORD)ALIGN_UP(dwCumulativeInstanceFieldPos, (pByValueMT->GetNumInstanceFieldBytes() >= DATA_ALIGNMENT) ? DATA_ALIGNMENT : TARGET_POINTER_SIZE); -#else // !(!defined(_WIN64) && (DATA_ALIGNMENT > 4)) +#else // !(!defined(_TARGET_64BIT_) && (DATA_ALIGNMENT > 4)) #ifdef FEATURE_64BIT_ALIGNMENT if (pByValueMT->RequiresAlign8()) dwCumulativeInstanceFieldPos = (DWORD)ALIGN_UP(dwCumulativeInstanceFieldPos, 8); else #endif // FEATURE_64BIT_ALIGNMENT dwCumulativeInstanceFieldPos = (DWORD)ALIGN_UP(dwCumulativeInstanceFieldPos, TARGET_POINTER_SIZE); -#endif // !(!defined(_WIN64) && (DATA_ALIGNMENT > 4)) +#endif // !(!defined(_TARGET_64BIT_) && (DATA_ALIGNMENT > 4)) pFieldDescList[i].SetOffset(dwCumulativeInstanceFieldPos - dwOffsetBias); dwCumulativeInstanceFieldPos += pByValueMT->GetAlignedNumInstanceFieldBytes(); |