From 7e54ae20fb83a38a26299392dfaf802d62812393 Mon Sep 17 00:00:00 2001
From: Andy Heninger <andy.heninger@gmail.com>
Date: Sun, 20 Oct 2013 21:15:16 +0000
Subject: [PATCH] ICU-10295 Revert bad commit to trunk; was supposed to be on a
 branch.

X-SVN-Rev: 34592
---
 icu4c/source/common/brkiter.cpp       | 2 +-
 icu4c/source/common/listformatter.cpp | 2 +-
 icu4c/source/common/locavailable.cpp  | 4 ++--
 icu4c/source/common/ucln_cmn.c        | 9 ---------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/icu4c/source/common/brkiter.cpp b/icu4c/source/common/brkiter.cpp
index 61376a4fd61..adbfd6501aa 100644
--- a/icu4c/source/common/brkiter.cpp
+++ b/icu4c/source/common/brkiter.cpp
@@ -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;
diff --git a/icu4c/source/common/listformatter.cpp b/icu4c/source/common/listformatter.cpp
index 345f98897b6..f4350d25ccc 100644
--- a/icu4c/source/common/listformatter.cpp
+++ b/icu4c/source/common/listformatter.cpp
@@ -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;
diff --git a/icu4c/source/common/locavailable.cpp b/icu4c/source/common/locavailable.cpp
index 9c8b8a92374..2bf19de07fb 100644
--- a/icu4c/source/common/locavailable.cpp
+++ b/icu4c/source/common/locavailable.cpp
@@ -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) {
diff --git a/icu4c/source/common/ucln_cmn.c b/icu4c/source/common/ucln_cmn.c
index de7316c643f..0c04b0d7f91 100644
--- a/icu4c/source/common/ucln_cmn.c
+++ b/icu4c/source/common/ucln_cmn.c
@@ -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;
-- 
2.40.0