Update GC from CoreRT
authorJan Kotas <jkotas@microsoft.com>
Mon, 16 May 2016 23:50:07 +0000 (16:50 -0700)
committerJan Kotas <jkotas@microsoft.com>
Tue, 17 May 2016 00:47:41 +0000 (17:47 -0700)
https://github.com/dotnet/corert/tree/master/src/Native/gc 854b9ea7accfbd24423a10382c1a5a2bd6753450

src/gc/env/gcenv.base.h

index 16636ae..7077082 100644 (file)
 #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();