From f0dd9e78dceaeb301c67aae6f8bb94cfe43ccaca Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 17 Sep 2013 06:31:09 +0000 Subject: [PATCH] ICU-10379 fixes for IBM i - passes all tests! X-SVN-Rev: 34348 --- icu4c/source/test/intltest/apicoll.cpp | 2 +- icu4c/source/tools/ctestfw/ucln_ct.c | 6 +++--- icu4c/source/tools/toolutil/ucln_tu.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/icu4c/source/test/intltest/apicoll.cpp b/icu4c/source/test/intltest/apicoll.cpp index e1c9b09f91b..537707876d8 100644 --- a/icu4c/source/test/intltest/apicoll.cpp +++ b/icu4c/source/test/intltest/apicoll.cpp @@ -2290,7 +2290,7 @@ void CollationAPITest::TestIterNumeric() { uiter_setUTF8(&iter40, "\x34\x30", 2); uiter_setUTF8(&iter72, "\x37\x32", 2); UCollationResult result = coll.compare(iter40, iter72, errorCode); - assertEquals("40<72", UCOL_LESS, result); + assertEquals("40<72", (int32_t)UCOL_LESS, (int32_t)result); } void CollationAPITest::dump(UnicodeString msg, RuleBasedCollator* c, UErrorCode& status) { diff --git a/icu4c/source/tools/ctestfw/ucln_ct.c b/icu4c/source/tools/ctestfw/ucln_ct.c index ae0a22571c3..ca75aefc68b 100644 --- a/icu4c/source/tools/ctestfw/ucln_ct.c +++ b/icu4c/source/tools/ctestfw/ucln_ct.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 2007-2010, International Business Machines Corporation and + * Copyright (c) 2007-2013, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ @@ -9,8 +9,8 @@ #define UCLN_TYPE UCLN_CTESTFW #include "ucln_imp.h" -int dummyFunction(void); -int dummyFunction(void) +int uprv_dummyFunction_CT(void); +int uprv_dummyFunction_CT(void) { /* this is here to prevent the compiler from complaining about an empty file */ return 0; diff --git a/icu4c/source/tools/toolutil/ucln_tu.c b/icu4c/source/tools/toolutil/ucln_tu.c index 7c7f5052cc8..5f4450fa996 100644 --- a/icu4c/source/tools/toolutil/ucln_tu.c +++ b/icu4c/source/tools/toolutil/ucln_tu.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 2007-2010, International Business Machines Corporation and + * Copyright (c) 2007-2013, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ @@ -9,8 +9,8 @@ #define UCLN_TYPE UCLN_TOOLUTIL #include "ucln_imp.h" -int dummyFunction(void); -int dummyFunction(void) +int uprv_dummyFunction_TU(void); +int uprv_dummyFunction_TU(void) { /* this is here to prevent the compiler from complaining about an empty file */ return 0;