diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-12 11:12:36 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-12 16:58:48 -0800 |
| commit | 5b9f6a1c0f09d74ea7fe870c7b6c14fe9b5002cc (patch) | |
| tree | 6efc019bd85071dfad4abb0f559ed8c5124e1cd0 /src/vm/object.h | |
| parent | c65413fd6470e853ceb02649906cdbc164700a97 (diff) | |
| download | coreclr-5b9f6a1c0f09d74ea7fe870c7b6c14fe9b5002cc.tar.gz coreclr-5b9f6a1c0f09d74ea7fe870c7b6c14fe9b5002cc.tar.bz2 coreclr-5b9f6a1c0f09d74ea7fe870c7b6c14fe9b5002cc.zip | |
Remove always defined FEATURE_SYNCHRONIZATIONCONTEXT_WAIT
Diffstat (limited to 'src/vm/object.h')
| -rw-r--r-- | src/vm/object.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/vm/object.h b/src/vm/object.h index 8a987db0b1..ababdbadaa 100644 --- a/src/vm/object.h +++ b/src/vm/object.h @@ -1599,7 +1599,6 @@ typedef SecurityContextObject* SECURITYCONTEXTREF; #endif #endif // #if defined(FEATURE_IMPERSONATION) || defined(FEATURE_COMPRESSEDSTACK) -#ifdef FEATURE_SYNCHRONIZATIONCONTEXT_WAIT #define SYNCCTXPROPS_REQUIRESWAITNOTIFICATION 0x1 // Keep in sync with SynchronizationContext.cs SynchronizationContextFlags class ThreadBaseObject; class SynchronizationContextObject: public Object @@ -1620,7 +1619,6 @@ public: return FALSE; } }; -#endif // FEATURE_SYNCHRONIZATIONCONTEXT_WAIT #ifdef FEATURE_REMOTING class CallContextRemotingDataObject : public Object @@ -1737,17 +1735,13 @@ typedef LogicalCallContextObject* LOGICALCALLCONTEXTREF; typedef DPTR(class CultureInfoBaseObject) PTR_CultureInfoBaseObject; #ifdef USE_CHECKED_OBJECTREFS -#ifdef FEATURE_SYNCHRONIZATIONCONTEXT_WAIT typedef REF<SynchronizationContextObject> SYNCHRONIZATIONCONTEXTREF; -#endif // FEATURE_SYNCHRONIZATIONCONTEXT_WAIT typedef REF<ExecutionContextObject> EXECUTIONCONTEXTREF; typedef REF<CultureInfoBaseObject> CULTUREINFOBASEREF; typedef REF<ArrayBase> ARRAYBASEREF; #else -#ifdef FEATURE_SYNCHRONIZATIONCONTEXT_WAIT typedef SynchronizationContextObject* SYNCHRONIZATIONCONTEXTREF; -#endif // FEATURE_SYNCHRONIZATIONCONTEXT_WAIT typedef CultureInfoBaseObject* CULTUREINFOBASEREF; typedef PTR_ArrayBase ARRAYBASEREF; #endif @@ -2109,13 +2103,11 @@ public: } #endif // FEATURE_LEAK_CULTURE_INFO -#ifdef FEATURE_SYNCHRONIZATIONCONTEXT_WAIT OBJECTREF GetSynchronizationContext() { LIMITED_METHOD_CONTRACT; return m_SynchronizationContext; } -#endif // FEATURE_SYNCHRONIZATIONCONTEXT_WAIT #ifdef FEATURE_COMPRESSEDSTACK COMPRESSEDSTACKREF GetCompressedStack() |