AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-10295 Revert bad commit to trunk; was supposed to be on a branch.

Browse Source 
X-SVN-Rev: 34592
This commit is contained in:
Andy Heninger 2013-10-20 21:15:16 +00:00
parent a2f8930fe9
commit 7e54ae20fb
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/brkiter.cpp
View File

@ -277,7 +277,7 @@ static icu::ICULocaleService* gService = NULL;
* Release all static memory held by breakiterator.
*/
U_CDECL_BEGIN
UBool U_CALLCONV breakiterator_cleanup(void) {
static UBool U_CALLCONV breakiterator_cleanup(void) {
#if !UCONFIG_NO_SERVICE
if (gService) {
delete gService;

2
icu4c/source/common/listformatter.cpp
View File

@ -32,7 +32,7 @@ static UChar SECOND_PARAMETER[] = { 0x7b, 0x31, 0x7d }; // "{0}"
static const char *STANDARD_STYLE = "standard";
U_CDECL_BEGIN
UBool U_CALLCONV uprv_listformatter_cleanup() {
static UBool U_CALLCONV uprv_listformatter_cleanup() {
delete listPatternHash;
listPatternHash = NULL;
return TRUE;

4
icu4c/source/common/locavailable.cpp
View File

@ -39,7 +39,7 @@ U_NAMESPACE_END
U_CDECL_BEGIN
UBool U_CALLCONV locale_available_cleanup(void)
static UBool U_CALLCONV locale_available_cleanup(void)
{
U_NAMESPACE_USE
@ -104,7 +104,7 @@ static icu::UInitOnce _installedLocalesInitOnce;
/* ### Get available **************************************************/
UBool U_CALLCONV uloc_cleanup(void) {
static UBool U_CALLCONV uloc_cleanup(void) {
char ** temp;
if (_installedLocales) {

9
icu4c/source/common/ucln_cmn.c
View File

@ -83,15 +83,6 @@ ucln_registerCleanup(ECleanupLibraryType type,
}
}
static cleanupFunc *gCommonCleanupFuncs[] = {
breakiterator_cleanup,
uprv_listformatter_cleanup,
locale_available_cleanup,
uloc_cleanup
};
U_CFUNC UBool ucln_lib_cleanup(void) {
ECleanupLibraryType libType = UCLN_START;
ECleanupCommonType commonFunc = UCLN_COMMON_START;