Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Commit

Permalink
Fix PInvokeTransitionFrame build break (#4559)
Browse files Browse the repository at this point in the history
In ProjectN, the latest change of PInvokeTransitionFrame specific for
USE_PORTABLE_HELPERS breaks the build. So I am fixing it by changing it
so that the change is for CoreRT only.
  • Loading branch information
janvorli authored and jkotas committed Sep 18, 2017
1 parent 4c92bb3 commit 71147d4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Native/Runtime/inc/rhbinder.h
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ enum PInvokeTransitionFrameFlags
#pragma warning(push)
#pragma warning(disable:4200) // nonstandard extension used: zero-sized array in struct/union
class Thread;
#ifdef USE_PORTABLE_HELPERS
#if defined(USE_PORTABLE_HELPERS) && defined(CORERT)
//the members of this structure are currently unused except m_pThread and exist only to allow compilation
//of StackFrameIterator their values are not currently being filled in and will require significant rework
//in order to satisfy the runtime requirements of StackFrameIterator
Expand All @@ -644,7 +644,7 @@ struct PInvokeTransitionFrame
uint32_t m_dwFlags; // PInvokeTransitionFrameFlags
uint64_t m_PreservedRegs[];
};
#else
#else // USE_PORTABLE_HELPERS && CORERT
struct PInvokeTransitionFrame
{
#ifdef _TARGET_ARM_
Expand All @@ -660,7 +660,7 @@ struct PInvokeTransitionFrame
#endif
UIntTarget m_PreservedRegs[];
};
#endif //USE_PORTABLE_HELPERS
#endif // USE_PORTABLE_HELPERS && CORERT
#pragma warning(pop)

#ifdef _TARGET_AMD64_
Expand Down

0 comments on commit 71147d4

Please sign in to comment.