Index: third_party/tcmalloc/chromium/src/base/dynamic_annotations.c |
=================================================================== |
--- third_party/tcmalloc/chromium/src/base/dynamic_annotations.c (revision 124832) |
+++ third_party/tcmalloc/chromium/src/base/dynamic_annotations.c (working copy) |
@@ -50,19 +50,10 @@ |
# endif |
#endif |
-/* Compiler-based ThreadSanitizer defines |
- DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL = 1 |
- and provides its own definitions of the functions. */ |
- |
-#ifndef DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL |
-# define DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL 0 |
-#endif |
- |
/* Each function is empty and called (via a macro) only in debug mode. |
The arguments are captured by dynamic tools at runtime. */ |
-#if DYNAMIC_ANNOTATIONS_ENABLED == 1 \ |
- && DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0 |
+#if DYNAMIC_ANNOTATIONS_ENABLED == 1 |
void AnnotateRWLockCreate(const char *file, int line, |
const volatile void *lock){} |
@@ -131,11 +122,8 @@ |
const volatile void *arg){} |
void AnnotateFlushState(const char *file, int line){} |
-#endif /* DYNAMIC_ANNOTATIONS_ENABLED == 1 |
- && DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0 */ |
+#endif /* DYNAMIC_ANNOTATIONS_ENABLED == 1 */ |
-#if DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0 |
- |
static int GetRunningOnValgrind(void) { |
#ifdef RUNNING_ON_VALGRIND |
if (RUNNING_ON_VALGRIND) return 1; |
@@ -171,8 +159,6 @@ |
return local_running_on_valgrind; |
} |
-#endif /* DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0 */ |
- |
/* See the comments in dynamic_annotations.h */ |
double ValgrindSlowdown(void) { |
/* Same initialization hack as in RunningOnValgrind(). */ |