organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-5423 Windows doesn't need this remapping code.

Browse source 
X-SVN-Rev: 20662
This commit is contained in:
George Rhoten 2006-11-15 19:01:21 +00:00
parent bb08eaf333
commit 879e341b5f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
icu4c/source/common/putil.c
View file

@ -626,8 +626,8 @@ static UBool isValidOlsonID(const char *id) {
}
#endif
#ifdef U_TZNAME
/*#include <stdio.h>*/
#if defined(U_TZNAME) && !defined(U_WINDOWS)
#define CONVERT_HOURS_TO_SECONDS(offset) (int32_t)(offset*3600)
typedef struct OffsetZoneMapping {
int32_t offsetSeconds;
@ -775,14 +775,20 @@ uprv_tzname(int n)
#endif
#ifdef U_TZNAME
#if !defined(U_WINDOWS)
/*
U_TZNAME is usually a non-unique abbreviation,
which isn't normally usable.
U_TZNAME is usually a non-unique abbreviation, which isn't normally usable.
So we remap the abbreviation to an olson ID.
Since Windows exposes a little more timezone information,
we normally don't use this code on Windows because uprv_detectWindowsTimeZone
should have already given the correct answer.
*/
tzid = remapShortTimeZone(U_TZNAME[0], U_TZNAME[1], uprv_daylight(), uprv_timezone());
if (tzid != NULL) {
return tzid;
}
#endif
return U_TZNAME[n];
#else
return "";