ICU-10881 uloc.cpp warning still wasn't fixed. fixing here.

X-SVN-Rev: 36482

diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp
index ea04bb7e006d7b4b07a479df27038b15820565e2..88a221c6024fe370aa8cab459d0509450da22a1b 100644 (file)
--- a/icu4c/source/common/uloc.cpp
+++ b/icu4c/source/common/uloc.cpp
@@ -2546,14 +2546,15 @@ uloc_toUnicodeLocaleType(const char* keyword, const char* value)
     return bcpType;
 }
 
-#define ISALPHANUM(c) (uprv_isASCIILetter(c) || ((c) >= '0') && ((c) <= '9'))
+#define UPRV_ISDIGIT(c) (((c) >= '0') && ((c) <= '9'))
+#define UPRV_ISALPHANUM(c) (uprv_isASCIILetter(c) || UPRV_ISDIGIT(c) )
 
 static UBool
 isWellFormedLegacyKey(const char* legacyKey)
 {
     const char* p = legacyKey;
     while (*p) {
-        if (!ISALPHANUM(*p)) {
+        if (!UPRV_ISALPHANUM(*p)) {
             return FALSE;
         }
         p++;
@@ -2572,7 +2573,7 @@ isWellFormedLegacyType(const char* legacyType)
                 return FALSE;
             }
             alphaNumLen = 0;
-        } else if (ISALPHANUM(*p)) {
+        } else if (UPRV_ISALPHANUM(*p)) {
             alphaNumLen++;
         } else {
             return FALSE;