| Index: src/ports/SkFontHost_mac.cpp
|
| diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
|
| index 8593b396117ced96e3a4414b2d069fe03e849ecb..6f0bbad6bd64c7d1dd29ea5e68793178bb54395f 100644
|
| --- a/src/ports/SkFontHost_mac.cpp
|
| +++ b/src/ports/SkFontHost_mac.cpp
|
| @@ -54,7 +54,7 @@
|
| #define USE_GLOBAL_MUTEX_FOR_CG_ACCESS
|
|
|
| #ifdef USE_GLOBAL_MUTEX_FOR_CG_ACCESS
|
| - SK_DECLARE_STATIC_MUTEX(gCGMutex);
|
| + static SkMutex gCGMutex;
|
| #define AUTO_CG_LOCK() SkAutoMutexAcquire amc(gCGMutex)
|
| #else
|
| #define AUTO_CG_LOCK()
|
| @@ -550,7 +550,7 @@ static SkTypeface* NewFromName(const char familyName[], const SkFontStyle& theSt
|
| return face;
|
| }
|
|
|
| -SK_DECLARE_STATIC_MUTEX(gGetDefaultFaceMutex);
|
| +static SkMutex gGetDefaultFaceMutex;
|
| static SkTypeface* GetDefaultFace() {
|
| SkAutoMutexAcquire ma(gGetDefaultFaceMutex);
|
|
|
|
|