1 files changed, 13 insertions, 14 deletions
diff --git a/src/vm/threads.h b/src/vm/threads.h
index a055f2e9e0..34fca24c4f 100644
--- a/src/vm/threads.h
+++ b/src/vm/threads.h
@@ -143,7 +143,7 @@
 #include "mscoree.h"
 #include "appdomainstack.h"
 #include "gcheaputilities.h"
-#include "gchandletableutilities.h"
+#include "gchandleutilities.h"
 #include "gcinfotypes.h"
 #include <clrhost.h>
 
@@ -6735,30 +6735,29 @@ public:
                             Thread::TriggersGC(GetThread());                \
                         } while(0)
 
+#else // ENABLE_CONTRACTS_IMPL
+
+#define BEGINFORBIDGC()
+#define ENDFORBIDGC()
+#define TRIGGERSGC_NOSTOMP() ANNOTATION_GC_TRIGGERS
+#define TRIGGERSGC() ANNOTATION_GC_TRIGGERS
+
+#endif // ENABLE_CONTRACTS_IMPL
 
 inline BOOL GC_ON_TRANSITIONS(BOOL val) {
     WRAPPER_NO_CONTRACT;
+#ifdef _DEBUG
     Thread* thread = GetThread();
     if (thread == 0)
         return(FALSE);
     BOOL ret = thread->m_GCOnTransitionsOK;
     thread->m_GCOnTransitionsOK = val;
     return(ret);
+#else // _DEBUG
+    return FALSE;
+#endif // !_DEBUG
 }
 
-#else   // _DEBUG_IMPL
-
-#define BEGINFORBIDGC()
-#define ENDFORBIDGC()
-#define TRIGGERSGC_NOSTOMP() ANNOTATION_GC_TRIGGERS
-#define TRIGGERSGC() ANNOTATION_GC_TRIGGERS
-
-inline BOOL GC_ON_TRANSITIONS(BOOL val) {
-        return FALSE;
-}
-
-#endif  // _DEBUG_IMPL
-
 #ifdef _DEBUG
 inline void ENABLESTRESSHEAP() {
     WRAPPER_NO_CONTRACT;