ICU-13027 - Use int32_t instead of int for a few places for consistency.

X-SVN-Rev: 39893

diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp
index 3ca007576289266b501e42814f19426f9e3ba1e1..eda04e57df0a68be43452b462b0e4581d018c836 100644 (file)
--- a/icu4c/source/common/locmap.cpp
+++ b/icu4c/source/common/locmap.cpp
@@ -1116,7 +1116,7 @@ uprv_convertToPosix(uint32_t hostid, char *posixID, int32_t posixIDCapacity, UEr
         // Note: LOCALE_ALLOW_NEUTRAL_NAMES was enabled in Windows7+, prior versions did not handle neutral (no-region) locale names.
         tmpLen = LCIDToLocaleName(hostid, (PWSTR)windowsLocaleName, UPRV_LENGTHOF(windowsLocaleName), LOCALE_ALLOW_NEUTRAL_NAMES);
         if (tmpLen > 1) {
-            int i = 0;
+            int32_t i = 0;
             // Only need to look up in table if have _, eg for de-de_phoneb type alternate sort.
             bLookup = FALSE;
             for (i = 0; i < UPRV_LENGTHOF(locName); i++)
@@ -1253,7 +1253,7 @@ uprv_convertToLCIDPlatform(const char* localeID)
     {
         // Need it to be UTF-16, not 8-bit
         wchar_t bcp47Tag[LOCALE_NAME_MAX_LENGTH] = {};
-        int i;
+        int32_t i;
         for (i = 0; i < UPRV_LENGTHOF(bcp47Tag); i++)
         {
             if (asciiBCP47Tag[i] == '\0')

diff --git a/icu4c/source/common/putil.cpp b/icu4c/source/common/putil.cpp
index 70618751ab90c0335a84fbe02f5f119686c8ef3d..011e6e178f8c9bf680afedca2ad2eedb3d79e8aa 100644 (file)
--- a/icu4c/source/common/putil.cpp
+++ b/icu4c/source/common/putil.cpp
@@ -1781,7 +1781,7 @@ The leftmost codepage (.xxx) wins.
         // First we need to go from UTF-16 to char (and also convert from _ to - while we're at it.)
         char modifiedWindowsLocale[LOCALE_NAME_MAX_LENGTH];
 
-        int i;
+        int32_t i;
         for (i = 0; i < UPRV_LENGTHOF(modifiedWindowsLocale); i++)
         {
             if (windowsLocale[i] == '_')

diff --git a/icu4c/source/common/umapfile.cpp b/icu4c/source/common/umapfile.cpp
index bfa9b1b719080588405b86a7cd4b41abc0e7fe70..df588a4f9502932dcd9b91b6d63e8ac351fb230a 100644 (file)
--- a/icu4c/source/common/umapfile.cpp
+++ b/icu4c/source/common/umapfile.cpp
@@ -117,7 +117,7 @@
         // First we need to go from char to UTF-16
         // u_UCharsToChars could work but it requires length.
         WCHAR utf16Path[MAX_PATH];
-        int i;
+        int32_t i;
         for (i = 0; i < UPRV_LENGTHOF(utf16Path); i++)
         {
             utf16Path[i] = path[i];

diff --git a/icu4c/source/i18n/windtfmt.cpp b/icu4c/source/i18n/windtfmt.cpp
index f9b575f8ab030f4966a8f13f0a1c82df476f6958..d0599ab5147039801c5ff3e7d305fc40dcfd4622 100644 (file)
--- a/icu4c/source/i18n/windtfmt.cpp
+++ b/icu4c/source/i18n/windtfmt.cpp
@@ -109,7 +109,7 @@ static UErrorCode GetEquivalentWindowsLocaleName(const Locale& locale, UnicodeSt
         // Need it to be UTF-16, not 8-bit
         // TODO: This seems like a good thing for a helper
         wchar_t bcp47Tag[LOCALE_NAME_MAX_LENGTH] = {};
-        int i;
+        int32_t i;
         for (i = 0; i < UPRV_LENGTHOF(bcp47Tag); i++)
         {
             if (asciiBCP47Tag[i] == '\0')

diff --git a/icu4c/source/i18n/winnmfmt.cpp b/icu4c/source/i18n/winnmfmt.cpp
index 3f8271efaf08acf9e50b0ce03f295a1e40719527..3e03cb1feef2e0ffd12de4c2cc441760abd8fa3d 100644 (file)
--- a/icu4c/source/i18n/winnmfmt.cpp
+++ b/icu4c/source/i18n/winnmfmt.cpp
@@ -154,7 +154,7 @@ static UErrorCode GetEquivalentWindowsLocaleName(const Locale& locale, UnicodeSt
         // Need it to be UTF-16, not 8-bit
         // TODO: This seems like a good thing for a helper
         wchar_t bcp47Tag[LOCALE_NAME_MAX_LENGTH] = {};
-        int i;
+        int32_t i;
         for (i = 0; i < UPRV_LENGTHOF(bcp47Tag); i++)
         {
             if (asciiBCP47Tag[i] == '\0')