intl/icu-patches/clang-cl.diff
author B2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 22 Jul 2014 07:30:28 -0700
changeset 195548 b64b42abd5f8282c08fca7ba57a70d26dbda7165
parent 190545 a2f87c54b7c87497738317bdc4ac1cda5f9bb5b5
permissions -rw-r--r--
Bumping gaia.json for 8 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/383735049e86 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Desc: Merge pull request #21846 from svic/Bug_1039239 Bug 1039239 - Better NFC handover error handling ======== https://hg.mozilla.org/integration/gaia-central/rev/b40b6117be3e Author: Arno Puder <arno@puder.org> Desc: Bug 1039239 - Better NFC handover error handling ======== https://hg.mozilla.org/integration/gaia-central/rev/8eba7c0e50e3 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Desc: Merge pull request #21837 from guilherme-pg/bug1034088-offline Bug 1034088 - Display the proper Settings panel for Find My Device when offline. ======== https://hg.mozilla.org/integration/gaia-central/rev/a57845e709a3 Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com> Desc: Bug 1034088 - Display the proper Settings panel for Find My Device when offline. ======== https://hg.mozilla.org/integration/gaia-central/rev/627a576d2058 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Desc: Merge pull request #21688 from flodolo/bug892700 Bug 892700 - Display Developer options on 2 lines if necessary ======== https://hg.mozilla.org/integration/gaia-central/rev/d6fe3b318ec0 Author: Francesco Lodolo (:flod) <flod@lodolo.net> Desc: Bug 892700 - Display Developer options on 2 lines if necessary ======== https://hg.mozilla.org/integration/gaia-central/rev/70edf8c17539 Author: Andrew Halberstadt <halbersa@gmail.com> Desc: Merge pull request #21888 from ahal/python_service Create a python runner service to run integration tests on device ======== https://hg.mozilla.org/integration/gaia-central/rev/ff1e44c2f817 Author: Andrew Halberstadt <halbersa@gmail.com> Desc: Bug 994847 - Create a python runner service for integration tests, r=mdas

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.