diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-10 07:35:53 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-10 07:35:53 +0300 |
| commit | e2f6e255fb6ec5649b550e1406c5d3bc6b1cb0cd (patch) | |
| tree | 49739e956294a999a4dc428c828f3f900eca196f /src/Native/Runtime/EHHelpers.cpp | |
| parent | 2c057e7ab0ad2ab1ff476094674a303a082960b9 (diff) | |
| parent | b685eb96c45513036a11d53644cd17c80fdc7710 (diff) | |
Merge remote-tracking branch 'upstream/nmirror' into nmirror-merge
Conflicts:
src/Native/Runtime/CachedInterfaceDispatch.cpp
Diffstat (limited to 'src/Native/Runtime/EHHelpers.cpp')
| -rw-r--r-- | src/Native/Runtime/EHHelpers.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Native/Runtime/EHHelpers.cpp b/src/Native/Runtime/EHHelpers.cpp index a49d9ff90..3ec63092d 100644 --- a/src/Native/Runtime/EHHelpers.cpp +++ b/src/Native/Runtime/EHHelpers.cpp @@ -9,13 +9,14 @@ #include "assert.h" #include "slist.h" #include "gcrhinterface.h" +#include "shash.h" +#include "RWLock.h" #include "module.h" #include "varint.h" #include "PalRedhawkCommon.h" #include "PalRedhawk.h" #include "holder.h" #include "Crst.h" -#include "RWLock.h" #include "RuntimeInstance.h" #include "event.h" #include "threadstore.h" |