diff options
Diffstat (limited to 'intl/icu/source/common')
-rw-r--r-- | intl/icu/source/common/common.vcxproj | 2 | ||||
-rw-r--r-- | intl/icu/source/common/common.vcxproj.filters | 2 | ||||
-rw-r--r-- | intl/icu/source/common/umutex.h | 4 | ||||
-rw-r--r-- | intl/icu/source/common/unicode/uvernum.h | 6 | ||||
-rw-r--r-- | intl/icu/source/common/wintz.c | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/intl/icu/source/common/common.vcxproj b/intl/icu/source/common/common.vcxproj index e6c9acffb..cc58ae931 100644 --- a/intl/icu/source/common/common.vcxproj +++ b/intl/icu/source/common/common.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> diff --git a/intl/icu/source/common/common.vcxproj.filters b/intl/icu/source/common/common.vcxproj.filters index 56e8c12f0..7cf6574bd 100644 --- a/intl/icu/source/common/common.vcxproj.filters +++ b/intl/icu/source/common/common.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="bidi"> 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 diff --git a/intl/icu/source/common/unicode/uvernum.h b/intl/icu/source/common/unicode/uvernum.h index 5590f9a5c..b502d444e 100644 --- a/intl/icu/source/common/unicode/uvernum.h +++ b/intl/icu/source/common/unicode/uvernum.h @@ -64,7 +64,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 2 +#define U_ICU_VERSION_MINOR_NUM 3 /** The current ICU patchlevel version as an integer. * This value will change in the subsequent releases of ICU @@ -119,7 +119,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "58.2" +#define U_ICU_VERSION "58.3" /** The current ICU library major/minor version as a string without dots, for library name suffixes. * This value will change in the subsequent releases of ICU @@ -131,7 +131,7 @@ /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "58.2" +#define U_ICU_DATA_VERSION "58.3" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/intl/icu/source/common/wintz.c b/intl/icu/source/common/wintz.c index a8696af39..14fc47604 100644 --- a/intl/icu/source/common/wintz.c +++ b/intl/icu/source/common/wintz.c @@ -216,6 +216,8 @@ static LONG getTZKeyName(char* tzKeyName, int32_t length) { &cbData); } + RegCloseKey(hkey); + return result; } |