Replace error checking mutex initializer with the glibc-compatible version

include/ports/SkMutex_pthread.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkMutex_pthread_DEFINED
 #define SkMutex_pthread_DEFINED
 
@@ skipping 55 matching lines @@
     ~SkMutex() {
         SkDEBUGCODE(int rc = )pthread_mutex_destroy(&fMutex);
         SkASSERT(0 == rc);
     }
 
 private:
     SkMutex(const SkMutex&);
     SkMutex& operator=(const SkMutex&);
 };
 
-#if defined(SK_DEBUG) && defined(PTHREAD_ERRORCHECK_MUTEX_INITIALIZER)
+#if defined(SK_DEBUG) && defined(PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP)
     // When possible we want to use error-check mutexes in Debug builds.  See the note at the top.
-    #define SK_BASE_MUTEX_INIT { PTHREAD_ERRORCHECK_MUTEX_INITIALIZER, kNoOwner }
+    #define SK_BASE_MUTEX_INIT { PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, kNoOwner }
 #elif defined(SK_DEBUG)
     // Macs don't support PTHREAD_ERRORCHECK_MUTEX_INITIALIZER when targeting <10.7. We target 10.6.
     #define SK_BASE_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER, kNoOwner }
 #else
     #define SK_BASE_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER }
 #endif
 
 // Using POD-style initialization prevents the generation of a static initializer.
 //
 // Without magic statics there are no thread safety guarantees on initialization
 // of local statics (even POD). As a result, it is illegal to use
 // SK_DECLARE_STATIC_MUTEX in a function.
 //
 // Because SkBaseMutex is not a primitive, a static SkBaseMutex cannot be
 // initialized in a class with this macro.
 #define SK_DECLARE_STATIC_MUTEX(name) namespace {} static SkBaseMutex name = SK_BASE_MUTEX_INIT
 
 #endif