diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-11-19 17:01:53 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-11-19 20:56:11 -0800 |
| commit | 94deb4236a2c007319baa78a5bf3a5b1d50f980b (patch) | |
| tree | 30ebdf3104fa0c8dd2e634986b8fdbd377825d0a /src/gc/gc.h | |
| parent | 227abcd8ca79fa0b0b5d4238e11c99a419f3f510 (diff) | |
| download | coreclr-94deb4236a2c007319baa78a5bf3a5b1d50f980b.tar.gz coreclr-94deb4236a2c007319baa78a5bf3a5b1d50f980b.tar.bz2 coreclr-94deb4236a2c007319baa78a5bf3a5b1d50f980b.zip | |
Update GC from CoreRT
https://github.com/dotnet/corert/tree/master/src/Native/gc c03d823a11f54e734e340813e6cd1e543ca448ef
Diffstat (limited to 'src/gc/gc.h')
| -rw-r--r-- | src/gc/gc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gc/gc.h b/src/gc/gc.h index dafa7f88fe..838f3bac7e 100644 --- a/src/gc/gc.h +++ b/src/gc/gc.h @@ -210,9 +210,11 @@ struct ScanContext AppDomain *pCurrentDomain; #endif //CHECK_APP_DOMAIN_LEAKS || FEATURE_APPDOMAIN_RESOURCE_MONITORING || DACCESS_COMPILE +#ifndef FEATURE_REDHAWK #if defined(GC_PROFILING) || defined (DACCESS_COMPILE) MethodDesc *pMD; #endif //GC_PROFILING || DACCESS_COMPILE +#endif // FEATURE_REDHAWK #if defined(GC_PROFILING) || defined(FEATURE_EVENT_TRACE) EtwGCRootKind dwEtwRootKind; #endif // GC_PROFILING || FEATURE_EVENT_TRACE @@ -363,6 +365,7 @@ void record_global_mechanism (int mech_index); #define GC_ALLOC_FINALIZE 0x1 #define GC_ALLOC_CONTAINS_REF 0x2 #define GC_ALLOC_ALIGN8_BIAS 0x4 +#define GC_ALLOC_ALIGN8 0x8 class GCHeap { friend struct ::_DacGlobals; @@ -433,6 +436,7 @@ public: } #endif #else // FEATURE_SVR_GC + UNREFERENCED_PARAMETER(bServerHeap); CONSISTENCY_CHECK(bServerHeap == false); #endif // FEATURE_SVR_GC } |