From 958cdc505889ead39336f8959d39d911f47e5629 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Wed, 26 Apr 2017 21:18:33 +0900 Subject: [PATCH] [x86/Linux] Use appropriate FCALL macro for DateMarshaler__ConvertToNative (dotnet/coreclr#11194) Commit migrated from https://github.com/dotnet/coreclr/commit/b4cc9d48590a87f38f9e1505fb0f0448b2473f34 --- src/coreclr/src/vm/stubhelpers.cpp | 2 +- src/coreclr/src/vm/stubhelpers.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/vm/stubhelpers.cpp b/src/coreclr/src/vm/stubhelpers.cpp index 0a5c143..db593c6 100644 --- a/src/coreclr/src/vm/stubhelpers.cpp +++ b/src/coreclr/src/vm/stubhelpers.cpp @@ -182,7 +182,7 @@ void StubHelpers::ProcessByrefValidationList() #endif // VERIFY_HEAP -FCIMPL1(double, StubHelpers::DateMarshaler__ConvertToNative, INT64 managedDate) +FCIMPL1_V(double, StubHelpers::DateMarshaler__ConvertToNative, INT64 managedDate) { FCALL_CONTRACT; diff --git a/src/coreclr/src/vm/stubhelpers.h b/src/coreclr/src/vm/stubhelpers.h index f7577d7..31693be 100644 --- a/src/coreclr/src/vm/stubhelpers.h +++ b/src/coreclr/src/vm/stubhelpers.h @@ -46,7 +46,7 @@ public: // PInvoke stub helpers //------------------------------------------------------- - static FCDECL1(double, DateMarshaler__ConvertToNative, INT64 managedDate); + static FCDECL1_V(double, DateMarshaler__ConvertToNative, INT64 managedDate); static FCDECL1_V(INT64, DateMarshaler__ConvertToManaged, double nativeDate); static FCDECL4(void, ValueClassMarshaler__ConvertToNative, LPVOID pDest, LPVOID pSrc, MethodTable* pMT, OBJECTREF *ppCleanupWorkListOnStack); -- 2.7.4