intl/icu-patches/qualify-uinitonce-windows.diff
author Carsten "Tomcat" Book <cbook@mozilla.com>
Fri, 21 Nov 2014 11:05:45 +0100
changeset 241220 1ff8792d5db27809e855ea14430b7b56450f2034
parent 182159 6e956de758ce84dfb882c82c988626b41e390630
permissions -rw-r--r--
Backed out changeset d917152c263d (bug 920938) for build warning/failures

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}