From 28ce35b674b27a84a72ee06bca44bb619faad45d Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Fri, 27 Jul 2007 23:59:25 +0000
Subject: [PATCH] ICU-4935 Consolidate conflicting definitions of UCaseMapFull

X-SVN-Rev: 22194
---
 icu4c/source/common/ucase.h    | 14 ++++++++++++++
 icu4c/source/common/ustr_imp.h |  9 ---------
 icu4c/source/i18n/casetrn.h    | 10 ----------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/icu4c/source/common/ucase.h b/icu4c/source/common/ucase.h
index 1310031f127..1c29482d8fc 100644
--- a/icu4c/source/common/ucase.h
+++ b/icu4c/source/common/ucase.h
@@ -241,6 +241,20 @@ ucase_toFullFolding(const UCaseProps *csp, UChar32 c,
 U_CFUNC int32_t U_EXPORT2
 ucase_hasBinaryProperty(UChar32 c, UProperty which);
 
+
+U_CDECL_BEGIN
+
+/**
+ * @internal
+ */
+typedef int32_t U_CALLCONV
+UCaseMapFull(const UCaseProps *csp, UChar32 c,
+             UCaseContextIterator *iter, void *context,
+             const UChar **pString,
+             const char *locale, int32_t *locCache);
+
+U_CDECL_END
+
 /* file definitions --------------------------------------------------------- */
 
 #define UCASE_DATA_NAME "ucase"
diff --git a/icu4c/source/common/ustr_imp.h b/icu4c/source/common/ustr_imp.h
index a466fb7e7c1..7c6681682cc 100644
--- a/icu4c/source/common/ustr_imp.h
+++ b/icu4c/source/common/ustr_imp.h
@@ -125,15 +125,6 @@ enum {
     FOLD_CASE
 };
 
-/**
- * @internal
- */
-typedef int32_t U_CALLCONV
-UCaseMapFull(const UCaseProps *csp, UChar32 c,
-             UCaseContextIterator *iter, void *context,
-             const UChar **pString,
-             const char *locale, int32_t *locCache);
-
 /**
  * @internal
  */
diff --git a/icu4c/source/i18n/casetrn.h b/icu4c/source/i18n/casetrn.h
index a5e123f3637..2e6ab15161b 100644
--- a/icu4c/source/i18n/casetrn.h
+++ b/icu4c/source/i18n/casetrn.h
@@ -26,16 +26,6 @@
 #include "unicode/translit.h"
 #include "ucase.h"
 
-U_CDECL_BEGIN
-
-typedef int32_t U_CALLCONV
-UCaseMapFull(const UCaseProps *csp, UChar32 c,
-             UCaseContextIterator *iter, void *context,
-             const UChar **pString,
-             const char *locale, int32_t *locCache);
-
-U_CDECL_END
-
 U_NAMESPACE_BEGIN
 
 /**