summaryrefslogtreecommitdiffstats
path: root/base/dynamic_annotations.cc
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 16:37:47 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 16:37:47 +0000
commit83f6cdd6000b4632d094c5e36f2633fb9cf7641f (patch)
treed0b29c941846b118be6084ffe5bdfecac87e707c /base/dynamic_annotations.cc
parentcca048bf67b8a044dc69c54f9fd691ef9143b865 (diff)
downloadchromium_src-83f6cdd6000b4632d094c5e36f2633fb9cf7641f.zip
chromium_src-83f6cdd6000b4632d094c5e36f2633fb9cf7641f.tar.gz
chromium_src-83f6cdd6000b4632d094c5e36f2633fb9cf7641f.tar.bz2
s/NDEBUG/NVALGRIND/g in base/dynamic_annotations.* to allow
ThreadSanitizer runs on release binaries. This is a copy of http://codereview.chromium.org/201060 I wasn't a commiter at that time. Please note that http://codereview.chromium.org/195078 was submitted recently which defines NVALGRIND for non-valgrind Release builds. Review URL: http://codereview.chromium.org/195091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/dynamic_annotations.cc')
-rw-r--r--base/dynamic_annotations.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/base/dynamic_annotations.cc b/base/dynamic_annotations.cc
index 1b16292..2ee0975 100644
--- a/base/dynamic_annotations.cc
+++ b/base/dynamic_annotations.cc
@@ -3,9 +3,8 @@
// found in the LICENSE file.
#include "base/dynamic_annotations.h"
-#include "base/third_party/valgrind/valgrind.h"
-#ifndef NDEBUG
+#ifndef NVALGRIND
// Each function is empty and called (via a macro) only in debug mode.
// The arguments are captured by dynamic tools at runtime.
@@ -56,7 +55,7 @@ extern "C" void AnnotateIgnoreWritesBegin(const char *file, int line) {}
extern "C" void AnnotateIgnoreWritesEnd(const char *file, int line) {}
extern "C" void AnnotateNoOp(const char *file, int line,
const volatile void *arg) {}
-#endif // NDEBUG
+#endif // NVALGRIND
// When running under valgrind, a non-zero value will be returned.
extern "C" int RunningOnValgrind() {