[x86/Linux] Fix dangling ClrCaptureContext (dotnet/coreclr#8453)
authorJonghyun Park <parjong@gmail.com>
Mon, 5 Dec 2016 20:29:56 +0000 (05:29 +0900)
committerJan Vorlicek <janvorli@microsoft.com>
Mon, 5 Dec 2016 20:29:56 +0000 (21:29 +0100)
Commit migrated from https://github.com/dotnet/coreclr/commit/c7a649255975920b8aaba2a7048823ca17384067

src/coreclr/src/inc/stacktrace.h

index 83646c8..49e9517 100644 (file)
@@ -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