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

Tue, 06 Jan 2015 21:39:09 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 06 Jan 2015 21:39:09 +0100
branch
TOR_BUG_9701
changeset 8
97036ab72558
permissions
-rw-r--r--

Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.

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

mercurial