From 0c1c7aad2b0f47f388e87a210e0350791e514baf Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 14 Dec 2009 05:57:34 +0000 Subject: [PATCH] ICU-7280 Move U_CDECL_END down to include function definitions as well as declarations. X-SVN-Rev: 27064 --- icu4c/source/i18n/currpinf.cpp | 3 +-- icu4c/source/i18n/decimfmt.cpp | 3 ++- icu4c/source/i18n/dtitvinf.cpp | 3 +-- icu4c/source/i18n/tmutfmt.cpp | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/icu4c/source/i18n/currpinf.cpp b/icu4c/source/i18n/currpinf.cpp index 1f4f321097c..6f37eac37b3 100644 --- a/icu4c/source/i18n/currpinf.cpp +++ b/icu4c/source/i18n/currpinf.cpp @@ -36,8 +36,6 @@ U_CDECL_BEGIN */ static UBool U_CALLCONV ValueComparator(UHashTok val1, UHashTok val2); -U_CDECL_END - UBool U_CALLCONV ValueComparator(UHashTok val1, UHashTok val2) { const UnicodeString* affix_1 = (UnicodeString*)val1.pointer; @@ -45,6 +43,7 @@ U_CALLCONV ValueComparator(UHashTok val1, UHashTok val2) { return *affix_1 == *affix_2; } +U_CDECL_END UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CurrencyPluralInfo) diff --git a/icu4c/source/i18n/decimfmt.cpp b/icu4c/source/i18n/decimfmt.cpp index c8d78685006..d710d0dce40 100644 --- a/icu4c/source/i18n/decimfmt.cpp +++ b/icu4c/source/i18n/decimfmt.cpp @@ -76,7 +76,6 @@ UBool U_CALLCONV decimfmtAffixValueComparator(UHashTok val1, UHashTok val2); */ UBool U_CALLCONV decimfmtAffixPatternValueComparator(UHashTok val1, UHashTok val2); -U_CDECL_END UBool U_CALLCONV decimfmtAffixValueComparator(UHashTok val1, UHashTok val2) { @@ -108,6 +107,8 @@ U_CALLCONV decimfmtAffixPatternValueComparator(UHashTok val1, UHashTok val2) { affix_1->patternType == affix_2->patternType; } +U_CDECL_END + //#define FMT_DEBUG diff --git a/icu4c/source/i18n/dtitvinf.cpp b/icu4c/source/i18n/dtitvinf.cpp index cd1db1d3a90..59cc14ec1c8 100644 --- a/icu4c/source/i18n/dtitvinf.cpp +++ b/icu4c/source/i18n/dtitvinf.cpp @@ -577,8 +577,6 @@ U_CDECL_BEGIN */ UBool U_CALLCONV dtitvinfHashTableValueComparator(UHashTok val1, UHashTok val2); -U_CDECL_END - UBool U_CALLCONV dtitvinfHashTableValueComparator(UHashTok val1, UHashTok val2) { const UnicodeString* pattern1 = (UnicodeString*)val1.pointer; @@ -591,6 +589,7 @@ U_CALLCONV dtitvinfHashTableValueComparator(UHashTok val1, UHashTok val2) { return ret; } +U_CDECL_END Hashtable* diff --git a/icu4c/source/i18n/tmutfmt.cpp b/icu4c/source/i18n/tmutfmt.cpp index 94e97e1fc84..9b60d7aa2ed 100644 --- a/icu4c/source/i18n/tmutfmt.cpp +++ b/icu4c/source/i18n/tmutfmt.cpp @@ -802,8 +802,6 @@ U_CDECL_BEGIN */ UBool U_CALLCONV tmutfmtHashTableValueComparator(UHashTok val1, UHashTok val2); -U_CDECL_END - UBool U_CALLCONV tmutfmtHashTableValueComparator(UHashTok val1, UHashTok val2) { const MessageFormat** pattern1 = (const MessageFormat**)val1.pointer; @@ -811,6 +809,8 @@ U_CALLCONV tmutfmtHashTableValueComparator(UHashTok val1, UHashTok val2) { return *pattern1[0] == *pattern2[0] && *pattern1[1] == *pattern2[1]; } +U_CDECL_END + Hashtable* TimeUnitFormat::initHash(UErrorCode& status) {