diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 19:08:06 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 19:08:06 +0000 |
| commit | 4cb84963b1c1da891eb0cee0c2a406c63552b500 (patch) | |
| tree | 03b475167044ebe38e4a75cbcfcf25f91141ec7e /base | |
| parent | d2dbbcf86f9cf7be55d83108c6946c3dacb76623 (diff) | |
| download | chromium_src-4cb84963b1c1da891eb0cee0c2a406c63552b500.zip chromium_src-4cb84963b1c1da891eb0cee0c2a406c63552b500.tar.gz chromium_src-4cb84963b1c1da891eb0cee0c2a406c63552b500.tar.bz2 | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/debug/leak_annotations.h | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |