94147f6ea2
Upstream changes https://ssl.icu-project.org/trac/changeset/32865 https://ssl.icu-project.org/trac/changeset/32908 See also https://bugzilla.redhat.com/show_bug.cgi?id=918167 Plus changed UMutex to UMTX to make these compile in icu49. Change-Id: Ib5dba7085e6b2dd3925c0c220b5d264e4c7bb4c8
12 lines
558 B
Diff
12 lines
558 B
Diff
diff -ruN icu.orig/source/common/locid.cpp icu/source/common/locid.cpp
|
|
--- build/icu.orig/source/common/locid.cpp 2013-03-06 21:27:35.170696967 +0100
|
|
+++ build/icu/source/common/locid.cpp 2013-03-06 21:29:47.711378977 +0100
|
|
@@ -53,7 +53,7 @@
|
|
static Locale *gLocaleCache = NULL;
|
|
|
|
// gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and gDefaultLocale.
|
|
-static UMutex gDefaultLocaleMutex = U_MUTEX_INITIALIZER;
|
|
+static UMTX gDefaultLocaleMutex = NULL;
|
|
static UHashtable *gDefaultLocalesHashT = NULL;
|
|
static Locale *gDefaultLocale = NULL;
|
|
|