Index: include/core/SkDynamicAnnotations.h |
diff --git a/include/core/SkDynamicAnnotations.h b/include/core/SkDynamicAnnotations.h |
index af8bdb675f1e344ddf9f5d3d2489a66cff553aee..e7710307f5532589a09b1f56d9b976cfdc373de7 100644 |
--- a/include/core/SkDynamicAnnotations.h |
+++ b/include/core/SkDynamicAnnotations.h |
@@ -8,14 +8,14 @@ |
#ifndef SkDynamicAnnotations_DEFINED |
#define SkDynamicAnnotations_DEFINED |
-// Make sure we see anything set via SkUserConfig.h (e.g. SK_DYNAMIC_ANNOTATIONS_ENABLED). |
+// Make sure we see anything set via SkUserConfig.h (e.g. DYNAMIC_ANNOTATIONS_ENABLED). |
#include "SkTypes.h" |
// This file contains macros used to send out-of-band signals to dynamic instrumentation systems, |
// namely thread sanitizer. This is a cut-down version of the full dynamic_annotations library with |
// only the features used by Skia. |
-#if SK_DYNAMIC_ANNOTATIONS_ENABLED |
+#if DYNAMIC_ANNOTATIONS_ENABLED |
extern "C" { |
// TSAN provides these hooks. |
@@ -58,7 +58,7 @@ void SK_ANNOTATE_BENIGN_RACE(T* ptr) { |
AnnotateBenignRaceSized(__FILE__, __LINE__, ptr, sizeof(*ptr), "SK_ANNOTATE_BENIGN_RACE"); |
} |
-#else // !SK_DYNAMIC_ANNOTATIONS_ENABLED |
+#else // !DYNAMIC_ANNOTATIONS_ENABLED |
#define SK_ANNOTATE_UNPROTECTED_READ(x) (x) |
#define SK_ANNOTATE_UNPROTECTED_WRITE(ptr, val) *(ptr) = (val) |