From de52c0a9d3196abadcec1b5505de384c75d03310 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Fri, 2 Mar 2012 20:22:04 +0000 Subject: [PATCH] ICU-9139 Make some internal globals static, update urename.h accordingly X-SVN-Rev: 31578 --- icu4c/source/common/unicode/urename.h | 4 ---- icu4c/source/i18n/decNumber.c | 2 +- icu4c/source/i18n/timezone.cpp | 6 +++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/icu4c/source/common/unicode/urename.h b/icu4c/source/common/unicode/urename.h index 99d8bda7f2e..0a2a1775cd5 100644 --- a/icu4c/source/common/unicode/urename.h +++ b/icu4c/source/common/unicode/urename.h @@ -54,10 +54,6 @@ #define DECPOWERS U_ICU_ENTRY_POINT_RENAME(DECPOWERS) #define DECSTICKYTAB U_ICU_ENTRY_POINT_RENAME(DECSTICKYTAB) -#define LEN_CANONICAL_SYSTEM_LOCATION_ZONES U_ICU_ENTRY_POINT_RENAME(LEN_CANONICAL_SYSTEM_LOCATION_ZONES) -#define LEN_CANONICAL_SYSTEM_ZONES U_ICU_ENTRY_POINT_RENAME(LEN_CANONICAL_SYSTEM_ZONES) -#define LEN_SYSTEM_ZONES U_ICU_ENTRY_POINT_RENAME(LEN_SYSTEM_ZONES) -#define LNnn U_ICU_ENTRY_POINT_RENAME(LNnn) #define T_CString_int64ToString U_ICU_ENTRY_POINT_RENAME(T_CString_int64ToString) #define T_CString_integerToString U_ICU_ENTRY_POINT_RENAME(T_CString_integerToString) #define T_CString_stringToInteger U_ICU_ENTRY_POINT_RENAME(T_CString_stringToInteger) diff --git a/icu4c/source/i18n/decNumber.c b/icu4c/source/i18n/decNumber.c index 6cbefa46a5d..5883c22b7f9 100644 --- a/icu4c/source/i18n/decNumber.c +++ b/icu4c/source/i18n/decNumber.c @@ -5533,7 +5533,7 @@ decNumber * decExpOp(decNumber *res, const decNumber *rhs, /* where x is truncated (NB) into the range 10 through 99, */ /* and then c = k>>2 and e = k&3. */ /* ------------------------------------------------------------------ */ -const uShort LNnn[90]={9016, 8652, 8316, 8008, 7724, 7456, 7208, +static const uShort LNnn[90]={9016, 8652, 8316, 8008, 7724, 7456, 7208, 6972, 6748, 6540, 6340, 6148, 5968, 5792, 5628, 5464, 5312, 5164, 5020, 4884, 4748, 4620, 4496, 4376, 4256, 4144, 4032, 39233, 38181, 37157, 36157, 35181, 34229, 33297, 32389, 31501, 30629, diff --git a/icu4c/source/i18n/timezone.cpp b/icu4c/source/i18n/timezone.cpp index 197dbdde09f..799de79c055 100644 --- a/icu4c/source/i18n/timezone.cpp +++ b/icu4c/source/i18n/timezone.cpp @@ -130,9 +130,9 @@ static int32_t* MAP_SYSTEM_ZONES = NULL; static int32_t* MAP_CANONICAL_SYSTEM_ZONES = NULL; static int32_t* MAP_CANONICAL_SYSTEM_LOCATION_ZONES = NULL; -int32_t LEN_SYSTEM_ZONES = 0; -int32_t LEN_CANONICAL_SYSTEM_ZONES = 0; -int32_t LEN_CANONICAL_SYSTEM_LOCATION_ZONES = 0; +static int32_t LEN_SYSTEM_ZONES = 0; +static int32_t LEN_CANONICAL_SYSTEM_ZONES = 0; +static int32_t LEN_CANONICAL_SYSTEM_LOCATION_ZONES = 0; U_CDECL_BEGIN static UBool U_CALLCONV timeZone_cleanup(void) -- 2.40.0