From 73ca79d7ee43118e305d316dff45485206576e4b Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 12 Jun 2015 14:25:23 -0700
Subject: [PATCH] Bug 1075758 - Remove the applied-upstream patch to pass the
 right argument type to InterlockedCompareExchange in ICU.  r=glandium

--HG--
extra : rebase_source : fa4cc22b6e07639d6986dba4a0f78af11b718d95
---
 intl/icu-patches/clang-cl.diff | 23 -----------------------
 intl/update-icu.sh             |  4 ----
 2 files changed, 27 deletions(-)
 delete mode 100644 intl/icu-patches/clang-cl.diff

diff --git a/intl/icu-patches/clang-cl.diff b/intl/icu-patches/clang-cl.diff
deleted file mode 100644
index f4ccd4541501..000000000000
--- 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.
diff --git a/intl/update-icu.sh b/intl/update-icu.sh
index 571c14b2a780..cb7f7cc4c5ac 100755
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -53,8 +53,4 @@ 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}