Bug 1075758 - Remove the applied-upstream patch to pass the right argument type to InterlockedCompareExchange in ICU. r=glandium
authorJeff Walden <jwalden@mit.edu>
Fri, 12 Jun 2015 14:25:23 -0700
changeset 250734 b8ff9ab0b32dce4a05701a176ef7a1a45d8e796c
parent 250733 80841ebc9acaa84a19a944e1f5b74c8d435d51f4
child 250735 a6a57dc9a5a7cfcbe14af2a1b010e3708488e99b
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs1075758
milestone42.0a1
Bug 1075758 - Remove the applied-upstream patch to pass the right argument type to InterlockedCompareExchange in ICU. r=glandium
intl/icu-patches/clang-cl.diff
intl/update-icu.sh
deleted file mode 100644
--- a/intl/icu-patches/clang-cl.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/intl/icu/source/common/umutex.cpp b/intl/icu/source/common/umutex.cpp
-index 8f55208..281c370 100644
---- a/intl/icu/source/common/umutex.cpp
-+++ b/intl/icu/source/common/umutex.cpp
-@@ -64,17 +64,17 @@ static UMutex   globalMutex = U_MUTEX_INITIALIZER;
- //   the caller needs to call the Init function.
- //
- 
- U_NAMESPACE_BEGIN
- 
- U_COMMON_API UBool U_EXPORT2 umtx_initImplPreInit(UInitOnce &uio) {
-     for (;;) {
-         int32_t previousState = InterlockedCompareExchange(
--#if (U_PLATFORM == U_PF_MINGW) || (U_PLATFORM == U_PF_CYGWIN)
-+#if (U_PLATFORM == U_PF_MINGW) || (U_PLATFORM == U_PF_CYGWIN) || defined(__clang__)
-            (LONG volatile *) // this is the type given in the API doc for this function.
- #endif
-             &uio.fState,  //  Destination
-             1,            //  Exchange Value
-             0);           //  Compare value
- 
-         if (previousState == 0) {
-             return true;   // Caller will next call the init function.
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -48,13 +48,9 @@ rm ${icu_dir}/source/data/translit/*
 # (This ensures that if ICU modifications are performed properly, it's always
 # 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
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff
 
-exit 0
-
-patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/clang-cl.diff
-
 hg addremove ${icu_dir}