X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/4388f060552cc537e71e957d32f35e9d75a61233..4d9eefca008a7bc544144ef830fa144ce89deaa0:/icuSources/common/serv.cpp?ds=inline diff --git a/icuSources/common/serv.cpp b/icuSources/common/serv.cpp index 2cddcfe6..1a8c9166 100644 --- a/icuSources/common/serv.cpp +++ b/icuSources/common/serv.cpp @@ -1,6 +1,6 @@ /** ******************************************************************************* -* Copyright (C) 2001-2011, International Business Machines Corporation. +* Copyright (C) 2001-2012, International Business Machines Corporation. * All Rights Reserved. ******************************************************************************* */ @@ -331,7 +331,7 @@ U_CDECL_END ****************************************************************** */ -static UMTX lock; +static UMutex lock = U_MUTEX_INITIALIZER; ICUService::ICUService() : name() @@ -401,7 +401,7 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, UErrorCode& // reentrantly even without knowing the thread. class XMutex : public UMemory { public: - inline XMutex(UMTX *mutex, UBool reentering) + inline XMutex(UMutex *mutex, UBool reentering) : fMutex(mutex) , fActive(!reentering) { @@ -412,7 +412,7 @@ public: } private: - UMTX *fMutex; + UMutex *fMutex; UBool fActive; };