diff options
author | Scott Mosier <smosier@microsoft.com> | 2015-11-05 01:51:04 +0300 |
---|---|---|
committer | Scott Mosier <smosier@microsoft.com> | 2015-11-20 03:06:03 +0300 |
commit | c03d823a11f54e734e340813e6cd1e543ca448ef (patch) | |
tree | 9253c3230e07568377a5744ffd8c0932774a3989 /src/Native/Runtime/ObjectLayout.cpp | |
parent | 896131b2af7bc8f3f01e56e391e9c186726f5c6f (diff) |
Changes required to integrate code back into ProjectN tree
Diffstat (limited to 'src/Native/Runtime/ObjectLayout.cpp')
-rw-r--r-- | src/Native/Runtime/ObjectLayout.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/Native/Runtime/ObjectLayout.cpp b/src/Native/Runtime/ObjectLayout.cpp index cfdf22791..9c7d14a9c 100644 --- a/src/Native/Runtime/ObjectLayout.cpp +++ b/src/Native/Runtime/ObjectLayout.cpp @@ -6,15 +6,10 @@ // // Implementations of functions dealing with object layout related types. // -#include "rhcommon.h" -#ifdef DACCESS_COMPILE -#include "gcrhenv.h" -#endif // DACCESS_COMPILE - -#ifndef DACCESS_COMPILE +#include "common.h" #include "CommonTypes.h" -#include "daccess.h" #include "CommonMacros.h" +#include "daccess.h" #include "assert.h" #include "RedhawkWarnings.h" #include "PalRedhawkCommon.h" @@ -22,7 +17,6 @@ #include "TargetPtrs.h" #include "eetype.h" #include "ObjectLayout.h" -#endif // !DACCESS_COMPILE #ifndef DACCESS_COMPILE void Object::InitEEType(EEType * pEEType) |