From 7ed5c687eded0e7b34002abb4ac3a534afbfec4a Mon Sep 17 00:00:00 2001
From: Sergey Matveev <earthdok@google.com>
Date: Fri, 21 Jun 2013 15:14:57 +0000
Subject: [PATCH] [lsan] Fix win build.

llvm-svn: 184555
---
 compiler-rt/lib/lsan/lsan_common.cc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/compiler-rt/lib/lsan/lsan_common.cc b/compiler-rt/lib/lsan/lsan_common.cc
index a86d9edfac43..341673fee900 100644
--- a/compiler-rt/lib/lsan/lsan_common.cc
+++ b/compiler-rt/lib/lsan/lsan_common.cc
@@ -20,14 +20,13 @@
 #include "sanitizer_common/sanitizer_stacktrace.h"
 #include "sanitizer_common/sanitizer_stoptheworld.h"
 
-#if CAN_SANITIZE_LEAKS
 namespace __lsan {
+#if CAN_SANITIZE_LEAKS
 
 // This mutex is used to prevent races between DoLeakCheck and SuppressObject.
 BlockingMutex global_mutex(LINKER_INITIALIZED);
 
 THREADLOCAL int disable_counter;
-bool DisabledInThisThread() { return disable_counter > 0; }
 
 Flags lsan_flags;
 
@@ -401,10 +400,16 @@ void LeakReport::PrintSummary() {
       "SUMMARY: LeakSanitizer: %zu byte(s) leaked in %zu allocation(s).\n\n",
       bytes, allocations);
 }
-
-}  // namespace __lsan
 #endif  // CAN_SANITIZE_LEAKS
 
+bool DisabledInThisThread() {
+#ifdef CAN_SANITIZE_LEAKS
+  return disable_counter > 0;
+#endif
+  return false;
+}
+}  // namespace __lsan
+
 using namespace __lsan;  // NOLINT
 
 extern "C" {