X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/57a6839dcb3bba09e8228b822b290604668416fe..2ca993e82fb37b597a3c73ecd1586a139a6579c5:/icuSources/i18n/zonemeta.cpp diff --git a/icuSources/i18n/zonemeta.cpp b/icuSources/i18n/zonemeta.cpp index be71a3b4..e2c75e55 100644 --- a/icuSources/i18n/zonemeta.cpp +++ b/icuSources/i18n/zonemeta.cpp @@ -27,8 +27,6 @@ #include "uhash.h" #include "olsontz.h" -#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) - static UMutex gZoneMetaLock = U_MUTEX_INITIALIZER; // CLDR Canonical ID mapping table @@ -269,7 +267,7 @@ ZoneMeta::getCanonicalCLDRID(const UnicodeString &tzid, UErrorCode& status) { // If not, resolve CLDR canonical ID with resource data UBool isInputCanonical = FALSE; char id[ZID_KEY_MAX + 1]; - tzid.extract(0, 0x7fffffff, id, LENGTHOF(id), US_INV); + tzid.extract(0, 0x7fffffff, id, UPRV_LENGTHOF(id), US_INV); // replace '/' with ':' char *p = id;