From 6fc675745832a8ee835dbc0a7f8aa652df79dfea Mon Sep 17 00:00:00 2001
From: Helena Chapman <helenashih@gmail.com>
Date: Mon, 12 Nov 2001 23:01:17 +0000
Subject: [PATCH] ICU-611 updated the APIs for u_digit and u_forDigit to be
 consistent.

X-SVN-Rev: 6802
---
 icu4c/source/common/uchar.c           | 2 +-
 icu4c/source/common/unicode/uchar.h   | 2 +-
 icu4c/source/common/unicode/unicode.h | 4 ++--
 icu4c/source/i18n/hextouni.cpp        | 2 +-
 icu4c/source/i18n/rbt_pars.cpp        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/icu4c/source/common/uchar.c b/icu4c/source/common/uchar.c
index 1e672148ebb..7913bca6a77 100644
--- a/icu4c/source/common/uchar.c
+++ b/icu4c/source/common/uchar.c
@@ -762,7 +762,7 @@ u_getCombiningClass(UChar32 c) {
     }
 }
 
-U_CAPI int8_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2
 u_digit(UChar32 ch, int8_t radix) {
     int8_t value;
     if((uint8_t)(radix-2)<=(36-2)) {
diff --git a/icu4c/source/common/unicode/uchar.h b/icu4c/source/common/unicode/uchar.h
index 71341627b70..ae78f7abc0d 100644
--- a/icu4c/source/common/unicode/uchar.h
+++ b/icu4c/source/common/unicode/uchar.h
@@ -1373,7 +1373,7 @@ u_foldCase(UChar32 c, uint32_t options);
  * @see     u_isdigit
  * @draft
  */
-U_CAPI int8_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2
 u_digit(UChar32 ch, int8_t radix);
 
 /**
diff --git a/icu4c/source/common/unicode/unicode.h b/icu4c/source/common/unicode/unicode.h
index 4a47092afe6..6a3308fa988 100644
--- a/icu4c/source/common/unicode/unicode.h
+++ b/icu4c/source/common/unicode/unicode.h
@@ -1044,7 +1044,7 @@ public:
      *
      * @deprecated See the Unicode class description.
      */
-    static inline int8_t digit(UChar32 ch, int8_t radix);
+    static inline int32_t digit(UChar32 ch, int8_t radix);
 
     /**
      * Determines the character representation for a specific digit in 
@@ -1325,7 +1325,7 @@ Unicode::digitValue(UChar32 ch) {
     return u_charDigitValue(ch);
 }
 
-inline int8_t
+inline int32_t
 Unicode::digit(UChar32 ch, int8_t radix) {
     return u_digit(ch, radix);
 }
diff --git a/icu4c/source/i18n/hextouni.cpp b/icu4c/source/i18n/hextouni.cpp
index ceee90e74c3..893455338f8 100644
--- a/icu4c/source/i18n/hextouni.cpp
+++ b/icu4c/source/i18n/hextouni.cpp
@@ -305,7 +305,7 @@ void HexToUnicodeTransliterator::handleTransliterate(Replaceable& text, UTransPo
                         }
                         break;
                     }
-                    int8_t digit = u_digit(text.charAt(curs), 16);
+                    int32_t digit = u_digit(text.charAt(curs), 16);
                     if (digit < 0) {
                         break;
                     }
diff --git a/icu4c/source/i18n/rbt_pars.cpp b/icu4c/source/i18n/rbt_pars.cpp
index cc7f2ee8a42..a5c81b73da0 100644
--- a/icu4c/source/i18n/rbt_pars.cpp
+++ b/icu4c/source/i18n/rbt_pars.cpp
@@ -1451,7 +1451,7 @@ int32_t TransliteratorParser::parseInteger(const UnicodeString& rule, int32_t& p
     }
 
     while (p < limit) {
-        int8_t d = u_digit(rule.charAt(p++), radix);
+        int32_t d = u_digit(rule.charAt(p++), radix);
         if (d < 0) {
             --p;
             break;