diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-27 20:50:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-27 20:50:56 +0000 |
commit | 6338f4358f37f44799d7d3c66d8363b6798043fd (patch) | |
tree | 32472d1967170bdd3c80fd0ab0ed9409388f9f41 /Build/source/libs/icu/icu-src/source/tools | |
parent | 46133be58cca10fe420003f25e1a301d8bda6192 (diff) |
TL-Changes for icu-57.1
git-svn-id: svn://tug.org/texlive/trunk@40155 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/tools')
3 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/libs/icu/icu-src/source/tools/ctestfw/unicode/utimer.h b/Build/source/libs/icu/icu-src/source/tools/ctestfw/unicode/utimer.h index 605158b05ba..7e42097dc5d 100644 --- a/Build/source/libs/icu/icu-src/source/tools/ctestfw/unicode/utimer.h +++ b/Build/source/libs/icu/icu-src/source/tools/ctestfw/unicode/utimer.h @@ -10,7 +10,7 @@ #include "unicode/utypes.h" -#if U_PLATFORM_HAS_WIN32_API +#if U_PLATFORM_USES_ONLY_WIN32_API # define VC_EXTRALEAN # define WIN32_LEAN_AND_MEAN # include <windows.h> @@ -160,7 +160,7 @@ typedef struct UTimer UTimer; typedef void FuntionToBeTimed(void* param); -#if U_PLATFORM_HAS_WIN32_API +#if U_PLATFORM_USES_ONLY_WIN32_API struct UTimer{ LARGE_INTEGER start; diff --git a/Build/source/libs/icu/icu-src/source/tools/genrb/derb.cpp b/Build/source/libs/icu/icu-src/source/tools/genrb/derb.cpp index 3d2507bc14e..1aeaf448ca4 100644 --- a/Build/source/libs/icu/icu-src/source/tools/genrb/derb.cpp +++ b/Build/source/libs/icu/icu-src/source/tools/genrb/derb.cpp @@ -204,7 +204,7 @@ main(int argc, char* argv[]) { UBool fromICUData = !uprv_strcmp(inputDir, "-"); if (!fromICUData) { UBool absfilename = *arg == U_FILE_SEP_CHAR; -#if U_PLATFORM_HAS_WIN32_API +#if U_PLATFORM_HAS_WIN32_API && U_PLATFORM != U_PF_CYGWIN if (!absfilename) { absfilename = (uprv_strlen(arg) > 2 && isalpha(arg[0]) && arg[1] == ':' && arg[2] == U_FILE_SEP_CHAR); diff --git a/Build/source/libs/icu/icu-src/source/tools/toolutil/udbgutil.cpp b/Build/source/libs/icu/icu-src/source/tools/toolutil/udbgutil.cpp index 819cbd91150..ebe7dca872c 100644 --- a/Build/source/libs/icu/icu-src/source/tools/toolutil/udbgutil.cpp +++ b/Build/source/libs/icu/icu-src/source/tools/toolutil/udbgutil.cpp @@ -348,8 +348,10 @@ int32_t udbg_enumByName(UDebugEnumType type, const char *value) { */ U_CAPI const char *udbg_getPlatform(void) { -#if U_PLATFORM_HAS_WIN32_API +#if U_PLATFORM_USES_ONLY_WIN32_API return "Windows"; +#elif U_PLATFORM == U_PF_CYGWIN + return "Cygwin"; #elif U_PLATFORM == U_PF_UNKNOWN return "unknown"; #elif U_PLATFORM == U_PF_DARWIN |