diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
| commit | a42bed2e9a78715889240ff900e2391bef923285 (patch) | |
| tree | 202c502b7e964384fb7f0639b756353374b0c045 /intl/icu/source/common/umutex.h | |
| parent | 9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff) | |
| parent | 276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff) | |
| download | UXP-a42bed2e9a78715889240ff900e2391bef923285.tar UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.gz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.lz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.xz UXP-a42bed2e9a78715889240ff900e2391bef923285.zip | |
Merge branch 'master' into remove-unboxed
# Conflicts:
# js/src/jit/BaselineIC.cpp
# js/src/jsarray.cpp
Diffstat (limited to 'intl/icu/source/common/umutex.h')
| -rw-r--r-- | intl/icu/source/common/umutex.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h index f13da130c..b52010f8a 100644 --- a/intl/icu/source/common/umutex.h +++ b/intl/icu/source/common/umutex.h @@ -86,9 +86,7 @@ U_NAMESPACE_END // Original plan was to use gcc atomics for MinGW, but they // aren't supported, so we fold MinGW into this path. -# ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN -# endif # define VC_EXTRALEAN # define NOUSER # define NOSERVICE @@ -333,9 +331,7 @@ U_NAMESPACE_END * win32 APIs for Critical Sections. */ -# ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN -# endif # define VC_EXTRALEAN # define NOUSER # define NOSERVICE |