diff options
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DM.cpp | 2 | ||||
-rw-r--r-- | dm/DMJsonWriter.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -104,7 +104,7 @@ static void info(const char* fmt) { } } -SK_DECLARE_STATIC_MUTEX(gFailuresMutex); +static SkMutex gFailuresMutex; static SkTArray<SkString> gFailures; static void fail(const SkString& err) { diff --git a/dm/DMJsonWriter.cpp b/dm/DMJsonWriter.cpp index 7bd8acd6d2..652c70b8cc 100644 --- a/dm/DMJsonWriter.cpp +++ b/dm/DMJsonWriter.cpp @@ -19,7 +19,7 @@ namespace DM { SkTArray<JsonWriter::BitmapResult> gBitmapResults; -SK_DECLARE_STATIC_MUTEX(gBitmapResultLock); +static SkMutex gBitmapResultLock; void JsonWriter::AddBitmapResult(const BitmapResult& result) { SkAutoMutexAcquire lock(&gBitmapResultLock); @@ -27,7 +27,7 @@ void JsonWriter::AddBitmapResult(const BitmapResult& result) { } SkTArray<skiatest::Failure> gFailures; -SK_DECLARE_STATIC_MUTEX(gFailureLock); +static SkMutex gFailureLock; void JsonWriter::AddTestFailure(const skiatest::Failure& failure) { SkAutoMutexAcquire lock(gFailureLock); |