diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-02-09 12:51:30 -0800 |
|---|---|---|
| committer | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-02-28 17:50:15 -0800 |
| commit | 81da03e19674a14c74cfa7bea55196b3c3649159 (patch) | |
| tree | 31b32f5d25b454ba044807452ac60d41374b25da /src/vm | |
| parent | 448a91d9437ea94387cda57ebe5fa670dfc9ae14 (diff) | |
| download | coreclr-81da03e19674a14c74cfa7bea55196b3c3649159.tar.gz coreclr-81da03e19674a14c74cfa7bea55196b3c3649159.tar.bz2 coreclr-81da03e19674a14c74cfa7bea55196b3c3649159.zip | |
Replace sizeof(LPVOID)==4 with #ifdef _TARGET_64BIT_ in fieldmarshaler.cpp
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/fieldmarshaler.cpp | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/src/vm/fieldmarshaler.cpp b/src/vm/fieldmarshaler.cpp index 750fc439c8..1e24399e30 100644 --- a/src/vm/fieldmarshaler.cpp +++ b/src/vm/fieldmarshaler.cpp @@ -496,14 +496,11 @@ do \ #endif // FEATURE_COMINTEROP if (fDefault || ntype == NATIVE_TYPE_INT || ntype == NATIVE_TYPE_UINT) { - if (sizeof(LPVOID)==4) - { - INITFIELDMARSHALER(NFT_COPY4, FieldMarshaler_Copy4, ()); - } - else - { - INITFIELDMARSHALER(NFT_COPY8, FieldMarshaler_Copy8, ()); - } +#ifdef _TARGET_64BIT_ + INITFIELDMARSHALER(NFT_COPY8, FieldMarshaler_Copy8, ()); +#else // !_TARGET_64BIT_ + INITFIELDMARSHALER(NFT_COPY4, FieldMarshaler_Copy4, ()); +#endif // !_TARGET_64BIT_ } else { @@ -543,20 +540,11 @@ do \ #endif // FEATURE_COMINTEROP if (fDefault) { - switch (sizeof(LPVOID)) - { - case 4: - INITFIELDMARSHALER(NFT_COPY4, FieldMarshaler_Copy4, ()); - break; - - case 8: - INITFIELDMARSHALER(NFT_COPY8, FieldMarshaler_Copy8, ()); - break; - - default: - INITFIELDMARSHALER(NFT_ILLEGAL, FieldMarshaler_Illegal, (IDS_EE_BADMARSHAL_BADMANAGED)); - break; - } +#ifdef _TARGET_64BIT_ + INITFIELDMARSHALER(NFT_COPY8, FieldMarshaler_Copy8, ()); +#else // !_TARGET_64BIT_ + INITFIELDMARSHALER(NFT_COPY4, FieldMarshaler_Copy4, ()); +#endif // !_TARGET_64BIT_ } else { |