From 4cb84963b1c1da891eb0cee0c2a406c63552b500 Mon Sep 17 00:00:00 2001 From: "earthdok@chromium.org" Date: Mon, 17 Jun 2013 19:08:06 +0000 Subject: Fix LeakSanitizer annotations for NaCl. NaCl code is not built with LSan runtime, so annotations should not be used. R=glider@chromium.org, jar@chromium.org Review URL: https://chromiumcodereview.appspot.com/16845006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206766 0039d316-1c4b-4281-b951-d872f2087c98 --- base/debug/leak_annotations.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h index 887b51d..42314c1 100644 --- a/base/debug/leak_annotations.h +++ b/base/debug/leak_annotations.h @@ -33,7 +33,7 @@ #define ANNOTATE_LEAKING_OBJECT_PTR(X) \ HeapLeakChecker::IgnoreObject(X) -#elif defined(LEAK_SANITIZER) +#elif defined(LEAK_SANITIZER) && !defined(OS_NACL) extern "C" { void __lsan_disable(); -- cgit v1.1