intl/icu-patches/qualify-uinitonce-windows.diff
author ffxbld <release@mozilla.com>
Mon, 29 Jun 2015 13:13:28 -0700
changeset 275215 9d83ab013ab61c7f6e987bf0e7cbab1a1aed1ca8
parent 183153 6e956de758ce84dfb882c82c988626b41e390630
permissions -rw-r--r--
No bug - Tagging mozilla-aurora d77cf3926884 with FIREFOX_BETA_40_BASE a=release DONTBUILD CLOSED TREE

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}