ICU-10379 fixes for IBM i - passes all tests!

X-SVN-Rev: 34348

diff --git a/icu4c/source/test/intltest/apicoll.cpp b/icu4c/source/test/intltest/apicoll.cpp
index e1c9b09f91be069b62ec98ff88371cd27f43ee20..537707876d8a41030a34031d7037c9bbd2a8e26e 100644 (file)
--- 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 ae0a22571c36ec77772e7d506374a7f86c3d55be..ca75aefc68b9fd89f6cbbb40ae6b33041b0c9303 100644 (file)
--- 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 7c7f5052cc80df2b1921bbe8cb327f0a545bccf0..5f4450fa9960087062c5ee38e7f34ce266db5cc4 100644 (file)
--- 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;