From 648467b8dffb6f6db3a6fe403e4b95eb3f664c41 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Tue, 6 Dec 2016 05:29:56 +0900 Subject: [PATCH] [x86/Linux] Fix dangling ClrCaptureContext (dotnet/coreclr#8453) Commit migrated from https://github.com/dotnet/coreclr/commit/c7a649255975920b8aaba2a7048823ca17384067 --- src/coreclr/src/inc/stacktrace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/src/inc/stacktrace.h b/src/coreclr/src/inc/stacktrace.h index 83646c8..49e9517 100644 --- a/src/coreclr/src/inc/stacktrace.h +++ b/src/coreclr/src/inc/stacktrace.h @@ -74,7 +74,7 @@ void GetStringFromStackLevels(UINT ifrStart, UINT cfrTotal, __out_ecount(cchMaxA ******************************************************************** robch */ void GetStringFromAddr(DWORD_PTR dwAddr, __out_ecount(cchMaxAssertStackLevelStringLen) LPSTR szString); -#if defined(_TARGET_X86_) && defined(FEATURE_CORECLR) +#if defined(_TARGET_X86_) && defined(FEATURE_CORECLR) && !defined(FEATURE_PAL) /**************************************************************************** * ClrCaptureContext * *-------------------* @@ -83,9 +83,9 @@ void GetStringFromAddr(DWORD_PTR dwAddr, __out_ecount(cchMaxAssertStackLevelStri * support this, so we need it for CoreCLR 4, if we require Win2K support ****************************************************************************/ extern "C" void __stdcall ClrCaptureContext(__out PCONTEXT ctx); -#else // _TARGET_X86_ && FEATURE_CORECLR +#else // _TARGET_X86_ && FEATURE_CORECLR && !FEATURE_PAL #define ClrCaptureContext RtlCaptureContext -#endif // _X86 && FEATURE_CORECLR else +#endif // _TARGET_X86_ && FEATURE_CORECLR && !FEATURE_PAL #endif -- 2.7.4