Bug 1075758 - Remove a patch properly qualifying a type in umutex.h (already landed upstream). r=glandium
authorJeff Walden <jwalden@mit.edu>
Fri, 12 Jun 2015 14:25:23 -0700
changeset 250732 cbcc5ea79885e44d23d3053a29cdc8beb492a134
parent 250731 2ce5c66c12839dc37aaa61013e2a43559c10cf37
child 250733 80841ebc9acaa84a19a944e1f5b74c8d435d51f4
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs1075758
milestone42.0a1
Bug 1075758 - Remove a patch properly qualifying a type in umutex.h (already landed upstream). r=glandium
intl/icu-patches/qualify-uinitonce-windows.diff
intl/update-icu.sh
deleted file mode 100644
--- a/intl/icu-patches/qualify-uinitonce-windows.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h
---- a/intl/icu/source/common/umutex.h
-+++ b/intl/icu/source/common/umutex.h
-@@ -315,17 +315,17 @@ U_NAMESPACE_END
- # define NOMCX
- # ifndef NOMINMAX
- # define NOMINMAX
- # endif
- # include <windows.h>
- 
- 
- typedef struct UMutex {
--    UInitOnce         fInitOnce;
-+    icu::UInitOnce    fInitOnce;
-     CRITICAL_SECTION  fCS;
- } UMutex;
- 
- /* Initializer for a static UMUTEX. Deliberately contains no value for the
-  *  CRITICAL_SECTION.
-  */
- #define U_MUTEX_INITIALIZER {U_INITONCE_INITIALIZER}
- 
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -49,13 +49,12 @@ rm ${icu_dir}/source/data/translit/*
 # possible to run the command at the top of this script and make no changes to
 # the tree.)
 svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO
 
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735
 
 exit 0
 
-patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/qualify-uinitonce-windows.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/clang-cl.diff
 
 hg addremove ${icu_dir}