intl/icu-patches/qualify-uinitonce-windows.diff

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

     1 diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h
     2 --- a/intl/icu/source/common/umutex.h
     3 +++ b/intl/icu/source/common/umutex.h
     4 @@ -315,17 +315,17 @@ U_NAMESPACE_END
     5  # define NOMCX
     6  # ifndef NOMINMAX
     7  # define NOMINMAX
     8  # endif
     9  # include <windows.h>
    12  typedef struct UMutex {
    13 -    UInitOnce         fInitOnce;
    14 +    icu::UInitOnce    fInitOnce;
    15      CRITICAL_SECTION  fCS;
    16  } UMutex;
    18  /* Initializer for a static UMUTEX. Deliberately contains no value for the
    19   *  CRITICAL_SECTION.
    20   */
    21  #define U_MUTEX_INITIALIZER {U_INITONCE_INITIALIZER}

mercurial