diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-05-16 16:50:07 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-05-16 17:47:41 -0700 |
commit | 8348ba3744cefc37460147f1540165fba27833e7 (patch) | |
tree | 04b37f8344747ebe6e5894921005d26df50ea082 /src/gc | |
parent | b0de8b0bc7c1274442ed8a64d41d72c7c2a0f8c3 (diff) | |
download | coreclr-8348ba3744cefc37460147f1540165fba27833e7.tar.gz coreclr-8348ba3744cefc37460147f1540165fba27833e7.tar.bz2 coreclr-8348ba3744cefc37460147f1540165fba27833e7.zip |
Update GC from CoreRT
https://github.com/dotnet/corert/tree/master/src/Native/gc 854b9ea7accfbd24423a10382c1a5a2bd6753450
Diffstat (limited to 'src/gc')
-rw-r--r-- | src/gc/env/gcenv.base.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gc/env/gcenv.base.h b/src/gc/env/gcenv.base.h index 16636aecff..7077082bb3 100644 --- a/src/gc/env/gcenv.base.h +++ b/src/gc/env/gcenv.base.h @@ -24,8 +24,12 @@ #endif // __clang__ #endif // !_MSC_VER +#ifndef SIZE_T_MAX #define SIZE_T_MAX ((size_t)-1) +#endif +#ifndef SSIZE_T_MAX #define SSIZE_T_MAX ((ptrdiff_t)(SIZE_T_MAX / 2)) +#endif #ifndef _INC_WINDOWS // ----------------------------------------------------------------------------------------------------------- @@ -454,7 +458,6 @@ public: static bool IsCurrentThreadFinalizer(); static void Wait(DWORD timeout, bool allowReentrantWait = false); - static bool WatchDog(); static void SignalFinalizationDone(bool fFinalizer); static void SetFinalizerThread(Thread * pThread); static HANDLE GetFinalizerEvent(); |