From: Steven R. Loomis <srl@icu-project.org>
Date: Sat, 11 Feb 2017 02:43:09 +0000 (+0000)
Subject: ICU-12766 z: library and tools build
X-Git-Tag: release-59-rc~125^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8ed8a6048daba52e5df995c6afb696450e8503f;p=icu

ICU-12766 z: library and tools build

X-SVN-Rev: 39665
---

diff --git a/icu4c/source/common/ucmndata.cpp b/icu4c/source/common/ucmndata.cpp
index 813dfe02dab..251c7ba1823 100644
--- a/icu4c/source/common/ucmndata.cpp
+++ b/icu4c/source/common/ucmndata.cpp
@@ -207,7 +207,9 @@ pointerTOCPrefixBinarySearch(const char *s, const PointerTOCEntry *toc, int32_t
     return -1;
 }
 
-static uint32_t offsetTOCEntryCount(const UDataMemory *pData) {
+U_CDECL_BEGIN
+static uint32_t U_CALLCONV
+offsetTOCEntryCount(const UDataMemory *pData) {
     int32_t          retVal=0;
     const UDataOffsetTOC *toc = (UDataOffsetTOC *)pData->toc;
     if (toc != NULL) {
@@ -216,7 +218,7 @@ static uint32_t offsetTOCEntryCount(const UDataMemory *pData) {
     return retVal;
 }
 
-static const DataHeader *
+static const DataHeader * U_CALLCONV
 offsetTOCLookupFn(const UDataMemory *pData,
                   const char *tocEntryName,
                   int32_t *pLength,
@@ -263,13 +265,12 @@ offsetTOCLookupFn(const UDataMemory *pData,
 }
 
 
-static uint32_t pointerTOCEntryCount(const UDataMemory *pData) {
+static uint32_t U_CALLCONV pointerTOCEntryCount(const UDataMemory *pData) {
     const PointerTOC *toc = (PointerTOC *)pData->toc;
     return (uint32_t)((toc != NULL) ? (toc->count) : 0);
 }
 
-
-static const DataHeader *pointerTOCLookupFn(const UDataMemory *pData,
+static const DataHeader * U_CALLCONV pointerTOCLookupFn(const UDataMemory *pData,
                    const char *name,
                    int32_t *pLength,
                    UErrorCode *pErrorCode) {
@@ -302,6 +303,8 @@ static const DataHeader *pointerTOCLookupFn(const UDataMemory *pData,
         return pData->pHeader;
     }
 }
+U_CDECL_END
+
 
 static const commonDataFuncs CmnDFuncs = {offsetTOCLookupFn,  offsetTOCEntryCount};
 static const commonDataFuncs ToCPFuncs = {pointerTOCLookupFn, pointerTOCEntryCount};
diff --git a/icu4c/source/common/ucnv_ct.cpp b/icu4c/source/common/ucnv_ct.cpp
index 520768eab99..c9a0ce36930 100644
--- a/icu4c/source/common/ucnv_ct.cpp
+++ b/icu4c/source/common/ucnv_ct.cpp
@@ -165,16 +165,17 @@ typedef struct{
 } UConverterDataCompoundText;
 
 /*********** Compound Text Converter Protos ***********/
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 _CompoundTextOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode);
 
-static void
+static void U_CALLCONV
  _CompoundTextClose(UConverter *converter);
 
-static void
+static void U_CALLCONV
 _CompoundTextReset(UConverter *converter, UConverterResetChoice choice);
 
-static const char*
+static const char* U_CALLCONV
 _CompoundTextgetName(const UConverter* cnv);
 
 
@@ -257,7 +258,7 @@ static COMPOUND_TEXT_CONVERTERS findStateFromEscSeq(const char* source, const ch
     return state;
 }
 
-static void
+static void U_CALLCONV
 _CompoundTextOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
     cnv->extraInfo = uprv_malloc (sizeof (UConverterDataCompoundText));
     if (cnv->extraInfo != NULL) {
@@ -300,7 +301,7 @@ _CompoundTextOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorC
 }
 
 
-static void
+static void U_CALLCONV
 _CompoundTextClose(UConverter *converter) {
     UConverterDataCompoundText* myConverterData = (UConverterDataCompoundText*)(converter->extraInfo);
     int32_t i;
@@ -317,19 +318,19 @@ _CompoundTextClose(UConverter *converter) {
     }
 }
 
-static void
+static void U_CALLCONV
 _CompoundTextReset(UConverter *converter, UConverterResetChoice choice) {
     (void)converter;
     (void)choice;
 }
 
-static const char*
+static const char* U_CALLCONV
 _CompoundTextgetName(const UConverter* cnv){
     (void)cnv;
     return "x11-compound-text";
 }
 
-static void
+static void U_CALLCONV
 UConverter_fromUnicode_CompoundText_OFFSETS(UConverterFromUnicodeArgs* args, UErrorCode* err){
     UConverter *cnv = args->converter;
     uint8_t *target = (uint8_t *) args->target;
@@ -461,7 +462,7 @@ getTrail:
 }
 
 
-static void
+static void U_CALLCONV
 UConverter_toUnicode_CompoundText_OFFSETS(UConverterToUnicodeArgs *args,
                                                UErrorCode* err){
     const char *mySource = (char *) args->source;
@@ -577,7 +578,7 @@ UConverter_toUnicode_CompoundText_OFFSETS(UConverterToUnicodeArgs *args,
     args->source = mySource;
 }
 
-static void
+static void U_CALLCONV
 _CompoundText_GetUnicodeSet(const UConverter *cnv,
                     const USetAdder *sa,
                     UConverterUnicodeSet which,
@@ -594,6 +595,7 @@ _CompoundText_GetUnicodeSet(const UConverter *cnv,
     sa->addRange(sa->set, 0x0020, 0x007F);
     sa->addRange(sa->set, 0x00A0, 0x00FF);
 }
+U_CDECL_END
 
 static const UConverterImpl _CompoundTextImpl = {
 
@@ -620,6 +622,7 @@ static const UConverterImpl _CompoundTextImpl = {
     NULL,
     NULL
 };
+
 static const UConverterStaticData _CompoundTextStaticData = {
     sizeof(UConverterStaticData),
     "COMPOUND_TEXT",
diff --git a/icu4c/source/common/ucnv_lmb.cpp b/icu4c/source/common/ucnv_lmb.cpp
index 96157ce32b0..ec6dc66bda9 100644
--- a/icu4c/source/common/ucnv_lmb.cpp
+++ b/icu4c/source/common/ucnv_lmb.cpp
@@ -582,7 +582,9 @@ typedef struct
   }
 UConverterDataLMBCS;
 
-static void _LMBCSClose(UConverter * _this);
+U_CDECL_BEGIN
+static void  U_CALLCONV _LMBCSClose(UConverter * _this);
+U_CDECL_END
 
 #define DECLARE_LMBCS_DATA(n) \
 static const UConverterImpl _LMBCSImpl##n={\
@@ -618,7 +620,7 @@ function, which will do basically the same thing except set a  different
 optimization group. So, we put the common stuff into a worker function, 
 and set up another macro to stamp out the 12 open functions:*/
 #define DEFINE_LMBCS_OPEN(n) \
-static void \
+static void U_CALLCONV \
    _LMBCSOpen##n(UConverter* _this, UConverterLoadArgs* pArgs, UErrorCode* err) \
 { _LMBCSOpenWorker(_this, pArgs, err, n); }
 
@@ -663,7 +665,8 @@ _LMBCSOpenWorker(UConverter*  _this,
     }
 }
 
-static void 
+U_CDECL_BEGIN
+static void  U_CALLCONV
 _LMBCSClose(UConverter *   _this) 
 {
     if (_this->extraInfo != NULL)
@@ -688,7 +691,7 @@ typedef struct LMBCSClone {
     UConverterDataLMBCS lmbcs;
 } LMBCSClone;
 
-static UConverter * 
+static UConverter *  U_CALLCONV
 _LMBCSSafeClone(const UConverter *cnv, 
                 void *stackBuffer, 
                 int32_t *pBufferSize, 
@@ -845,7 +848,7 @@ LMBCSConvertUni(ulmbcs_byte_t * pLMBCS, UChar uniChar)
 
 
 /* The main Unicode to LMBCS conversion function */
-static void 
+static void  U_CALLCONV
 _LMBCSFromUnicode(UConverterFromUnicodeArgs*     args,
                   UErrorCode*     err)
 {
@@ -1112,7 +1115,7 @@ GetUniFromLMBCSUni(char const ** ppLMBCSin)  /* Called with LMBCS-style Unicode
 
 /* Return the Unicode representation for the current LMBCS character */
 
-static UChar32 
+static UChar32  U_CALLCONV
 _LMBCSGetNextUCharWorker(UConverterToUnicodeArgs*   args,
                          UErrorCode*   err)
 {
@@ -1254,7 +1257,7 @@ _LMBCSGetNextUCharWorker(UConverterToUnicodeArgs*   args,
 /* The exported function that converts lmbcs to one or more
    UChars - currently UTF-16
 */
-static void 
+static void  U_CALLCONV
 _LMBCSToUnicodeWithOffsets(UConverterToUnicodeArgs*    args,
                      UErrorCode*    err)
 {
@@ -1378,4 +1381,6 @@ DECLARE_LMBCS_DATA(17)
 DECLARE_LMBCS_DATA(18)
 DECLARE_LMBCS_DATA(19)
 
+U_CDECL_END
+
 #endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */
diff --git a/icu4c/source/common/ucnv_u16.cpp b/icu4c/source/common/ucnv_u16.cpp
index 4e6ade2f990..91291c003b8 100644
--- a/icu4c/source/common/ucnv_u16.cpp
+++ b/icu4c/source/common/ucnv_u16.cpp
@@ -30,11 +30,12 @@ enum {
     UCNV_NEED_TO_WRITE_BOM=1
 };
 
+U_CDECL_BEGIN
 /*
  * The UTF-16 toUnicode implementation is also used for the Java-specific
  * "with BOM" variants of UTF-16BE and UTF-16LE.
  */
-static void
+static void  U_CALLCONV
 _UTF16ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                            UErrorCode *pErrorCode);
 
@@ -47,7 +48,7 @@ _UTF16ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
 #endif
 
 
-static void
+static void  U_CALLCONV
 _UTF16BEFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
                                UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -251,7 +252,7 @@ _UTF16BEFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
     pArgs->offsets=offsets;
 }
 
-static void
+static void  U_CALLCONV
 _UTF16BEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                              UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -489,7 +490,7 @@ _UTF16BEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
     pArgs->offsets=offsets;
 }
 
-static UChar32
+static UChar32  U_CALLCONV
 _UTF16BEGetNextUChar(UConverterToUnicodeArgs *pArgs, UErrorCode *err) {
     const uint8_t *s, *sourceLimit;
     UChar32 c;
@@ -568,7 +569,7 @@ _UTF16BEGetNextUChar(UConverterToUnicodeArgs *pArgs, UErrorCode *err) {
     return c;
 } 
 
-static void
+static void  U_CALLCONV
 _UTF16BEReset(UConverter *cnv, UConverterResetChoice choice) {
     if(choice<=UCNV_RESET_TO_UNICODE) {
         /* reset toUnicode state */
@@ -584,7 +585,7 @@ _UTF16BEReset(UConverter *cnv, UConverterResetChoice choice) {
     }
 }
 
-static void
+static void  U_CALLCONV
 _UTF16BEOpen(UConverter *cnv,
              UConverterLoadArgs *pArgs,
              UErrorCode *pErrorCode) {
@@ -596,7 +597,7 @@ _UTF16BEOpen(UConverter *cnv,
     }
 }
 
-static const char *
+static const char *  U_CALLCONV
 _UTF16BEGetName(const UConverter *cnv) {
     if(UCNV_GET_VERSION(cnv)==0) {
         return "UTF-16BE";
@@ -604,6 +605,7 @@ _UTF16BEGetName(const UConverter *cnv) {
         return "UTF-16BE,version=1";
     }
 }
+U_CDECL_END
 
 static const UConverterImpl _UTF16BEImpl={
     UCNV_UTF16_BigEndian,
@@ -646,8 +648,8 @@ const UConverterSharedData _UTF16BEData=
         UCNV_IMMUTABLE_SHARED_DATA_INITIALIZER(&_UTF16BEStaticData, &_UTF16BEImpl);
 
 /* UTF-16LE ----------------------------------------------------------------- */
-
-static void
+U_CDECL_BEGIN
+static void  U_CALLCONV
 _UTF16LEFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
                                UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -851,7 +853,7 @@ _UTF16LEFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
     pArgs->offsets=offsets;
 }
 
-static void
+static void  U_CALLCONV
 _UTF16LEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                              UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -1089,7 +1091,7 @@ _UTF16LEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
     pArgs->offsets=offsets;
 }
 
-static UChar32
+static UChar32  U_CALLCONV
 _UTF16LEGetNextUChar(UConverterToUnicodeArgs *pArgs, UErrorCode *err) {
     const uint8_t *s, *sourceLimit;
     UChar32 c;
@@ -1168,7 +1170,7 @@ _UTF16LEGetNextUChar(UConverterToUnicodeArgs *pArgs, UErrorCode *err) {
     return c;
 } 
 
-static void
+static void  U_CALLCONV
 _UTF16LEReset(UConverter *cnv, UConverterResetChoice choice) {
     if(choice<=UCNV_RESET_TO_UNICODE) {
         /* reset toUnicode state */
@@ -1184,7 +1186,7 @@ _UTF16LEReset(UConverter *cnv, UConverterResetChoice choice) {
     }
 }
 
-static void
+static void  U_CALLCONV
 _UTF16LEOpen(UConverter *cnv,
              UConverterLoadArgs *pArgs,
              UErrorCode *pErrorCode) {
@@ -1196,7 +1198,7 @@ _UTF16LEOpen(UConverter *cnv,
     }
 }
 
-static const char *
+static const char *  U_CALLCONV
 _UTF16LEGetName(const UConverter *cnv) {
     if(UCNV_GET_VERSION(cnv)==0) {
         return "UTF-16LE";
@@ -1204,6 +1206,7 @@ _UTF16LEGetName(const UConverter *cnv) {
         return "UTF-16LE,version=1";
     }
 }
+U_CDECL_END
 
 static const UConverterImpl _UTF16LEImpl={
     UCNV_UTF16_LittleEndian,
@@ -1271,8 +1274,8 @@ const UConverterSharedData _UTF16LEData=
  * - UTF-16BE,version=1 (Java "UnicodeBig" encoding) and
  *   UTF-16LE,version=1 (Java "UnicodeLittle" encoding) treat a reverse BOM as an error.
  */
-
-static void
+U_CDECL_BEGIN
+static void  U_CALLCONV
 _UTF16Reset(UConverter *cnv, UConverterResetChoice choice) {
     if(choice<=UCNV_RESET_TO_UNICODE) {
         /* reset toUnicode: state=0 */
@@ -1283,10 +1286,10 @@ _UTF16Reset(UConverter *cnv, UConverterResetChoice choice) {
         cnv->fromUnicodeStatus=UCNV_NEED_TO_WRITE_BOM;
     }
 }
-
+U_CDECL_END
 extern const UConverterSharedData _UTF16v2Data;
-
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 _UTF16Open(UConverter *cnv,
            UConverterLoadArgs *pArgs,
            UErrorCode *pErrorCode) {
@@ -1307,7 +1310,7 @@ _UTF16Open(UConverter *cnv,
     }
 }
 
-static const char *
+static const char *  U_CALLCONV
 _UTF16GetName(const UConverter *cnv) {
     if(UCNV_GET_VERSION(cnv)==0) {
         return "UTF-16";
@@ -1317,14 +1320,15 @@ _UTF16GetName(const UConverter *cnv) {
         return "UTF-16,version=2";
     }
 }
-
+U_CDECL_END
 extern const UConverterSharedData _UTF16Data;
 
 #define IS_UTF16BE(cnv) ((cnv)->sharedData==&_UTF16BEData)
 #define IS_UTF16LE(cnv) ((cnv)->sharedData==&_UTF16LEData)
 #define IS_UTF16(cnv) ((cnv)->sharedData==&_UTF16Data || (cnv)->sharedData==&_UTF16v2Data)
 
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 _UTF16ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                            UErrorCode *pErrorCode) {
     UConverter *cnv=pArgs->converter;
@@ -1464,7 +1468,7 @@ _UTF16ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
     cnv->mode=state;
 }
 
-static UChar32
+static UChar32 U_CALLCONV
 _UTF16GetNextUChar(UConverterToUnicodeArgs *pArgs,
                    UErrorCode *pErrorCode) {
     switch(pArgs->converter->mode) {
@@ -1476,6 +1480,7 @@ _UTF16GetNextUChar(UConverterToUnicodeArgs *pArgs,
         return UCNV_GET_NEXT_UCHAR_USE_TO_U;
     }
 }
+U_CDECL_END
 
 static const UConverterImpl _UTF16Impl = {
     UCNV_UTF16,
diff --git a/icu4c/source/common/ucnv_u32.cpp b/icu4c/source/common/ucnv_u32.cpp
index b44994b213b..e1b755ab7f2 100644
--- a/icu4c/source/common/ucnv_u32.cpp
+++ b/icu4c/source/common/ucnv_u32.cpp
@@ -42,8 +42,8 @@ enum {
 };
 
 /* UTF-32BE ----------------------------------------------------------------- */
-
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 T_UConverter_toUnicode_UTF32_BE(UConverterToUnicodeArgs * args,
                                 UErrorCode * err)
 {
@@ -122,7 +122,7 @@ donefornow:
     args->source = (const char *) mySource;
 }
 
-static void
+static void U_CALLCONV
 T_UConverter_toUnicode_UTF32_BE_OFFSET_LOGIC(UConverterToUnicodeArgs * args,
                                              UErrorCode * err)
 {
@@ -209,7 +209,7 @@ donefornow:
     args->offsets = myOffsets;
 }
 
-static void
+static void U_CALLCONV
 T_UConverter_fromUnicode_UTF32_BE(UConverterFromUnicodeArgs * args,
                                   UErrorCode * err)
 {
@@ -310,7 +310,7 @@ lowsurogate:
     args->source = mySource;
 }
 
-static void
+static void U_CALLCONV
 T_UConverter_fromUnicode_UTF32_BE_OFFSET_LOGIC(UConverterFromUnicodeArgs * args,
                                                UErrorCode * err)
 {
@@ -417,7 +417,7 @@ lowsurogate:
     args->offsets = myOffsets;
 }
 
-static UChar32
+static UChar32 U_CALLCONV
 T_UConverter_getNextUChar_UTF32_BE(UConverterToUnicodeArgs* args,
                                    UErrorCode* err)
 {
@@ -461,7 +461,7 @@ T_UConverter_getNextUChar_UTF32_BE(UConverterToUnicodeArgs* args,
     *err = U_ILLEGAL_CHAR_FOUND;
     return 0xffff;
 }
-
+U_CDECL_END
 static const UConverterImpl _UTF32BEImpl = {
     UCNV_UTF32_BigEndian,
 
@@ -504,8 +504,8 @@ const UConverterSharedData _UTF32BEData =
         UCNV_IMMUTABLE_SHARED_DATA_INITIALIZER(&_UTF32BEStaticData, &_UTF32BEImpl);
 
 /* UTF-32LE ---------------------------------------------------------- */
-
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 T_UConverter_toUnicode_UTF32_LE(UConverterToUnicodeArgs * args,
                                 UErrorCode * err)
 {
@@ -590,7 +590,7 @@ donefornow:
     args->source = (const char *) mySource;
 }
 
-static void
+static void U_CALLCONV
 T_UConverter_toUnicode_UTF32_LE_OFFSET_LOGIC(UConverterToUnicodeArgs * args,
                                              UErrorCode * err)
 {
@@ -687,7 +687,7 @@ donefornow:
     args->offsets = myOffsets;
 }
 
-static void
+static void U_CALLCONV
 T_UConverter_fromUnicode_UTF32_LE(UConverterFromUnicodeArgs * args,
                                   UErrorCode * err)
 {
@@ -796,7 +796,7 @@ lowsurogate:
     args->source = mySource;
 }
 
-static void
+static void U_CALLCONV
 T_UConverter_fromUnicode_UTF32_LE_OFFSET_LOGIC(UConverterFromUnicodeArgs * args,
                                                UErrorCode * err)
 {
@@ -912,7 +912,7 @@ lowsurogate:
     args->offsets = myOffsets;
 }
 
-static UChar32
+static UChar32 U_CALLCONV
 T_UConverter_getNextUChar_UTF32_LE(UConverterToUnicodeArgs* args,
                                    UErrorCode* err)
 {
@@ -956,7 +956,7 @@ T_UConverter_getNextUChar_UTF32_LE(UConverterToUnicodeArgs* args,
     *err = U_ILLEGAL_CHAR_FOUND;
     return 0xffff;
 }
-
+U_CDECL_END
 static const UConverterImpl _UTF32LEImpl = {
     UCNV_UTF32_LittleEndian,
 
@@ -1021,8 +1021,8 @@ const UConverterSharedData _UTF32LEData =
  *
  * On output, emit U+FEFF as the first code point.
  */
-
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 _UTF32Reset(UConverter *cnv, UConverterResetChoice choice) {
     if(choice<=UCNV_RESET_TO_UNICODE) {
         /* reset toUnicode: state=0 */
@@ -1034,7 +1034,7 @@ _UTF32Reset(UConverter *cnv, UConverterResetChoice choice) {
     }
 }
 
-static void
+static void U_CALLCONV
 _UTF32Open(UConverter *cnv,
            UConverterLoadArgs *pArgs,
            UErrorCode *pErrorCode) {
@@ -1045,7 +1045,7 @@ _UTF32Open(UConverter *cnv,
 
 static const char utf32BOM[8]={ 0, 0, (char)0xfe, (char)0xff,    (char)0xff, (char)0xfe, 0, 0 };
 
-static void
+static void U_CALLCONV
 _UTF32ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                            UErrorCode *pErrorCode) {
     UConverter *cnv=pArgs->converter;
@@ -1186,7 +1186,7 @@ _UTF32ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
     cnv->mode=state;
 }
 
-static UChar32
+static UChar32 U_CALLCONV
 _UTF32GetNextUChar(UConverterToUnicodeArgs *pArgs,
                    UErrorCode *pErrorCode) {
     switch(pArgs->converter->mode) {
@@ -1198,7 +1198,7 @@ _UTF32GetNextUChar(UConverterToUnicodeArgs *pArgs,
         return UCNV_GET_NEXT_UCHAR_USE_TO_U;
     }
 }
-
+U_CDECL_END
 static const UConverterImpl _UTF32Impl = {
     UCNV_UTF32,
 
diff --git a/icu4c/source/common/ucnv_u7.cpp b/icu4c/source/common/ucnv_u7.cpp
index 6108f4fd599..87ba8cf37ec 100644
--- a/icu4c/source/common/ucnv_u7.cpp
+++ b/icu4c/source/common/ucnv_u7.cpp
@@ -179,7 +179,8 @@ fromBase64[128]={
  *
  */
 
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 _UTF7Reset(UConverter *cnv, UConverterResetChoice choice) {
     if(choice<=UCNV_RESET_TO_UNICODE) {
         /* reset toUnicode */
@@ -192,7 +193,7 @@ _UTF7Reset(UConverter *cnv, UConverterResetChoice choice) {
     }
 }
 
-static void
+static void U_CALLCONV
 _UTF7Open(UConverter *cnv,
           UConverterLoadArgs *pArgs,
           UErrorCode *pErrorCode) {
@@ -206,7 +207,7 @@ _UTF7Open(UConverter *cnv,
     }
 }
 
-static void
+static void U_CALLCONV
 _UTF7ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                           UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -457,7 +458,7 @@ unicodeMode:
     return;
 }
 
-static void
+static void U_CALLCONV
 _UTF7FromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
                             UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -733,7 +734,7 @@ unicodeMode:
     return;
 }
 
-static const char *
+static const char * U_CALLCONV
 _UTF7GetName(const UConverter *cnv) {
     switch(cnv->fromUnicodeStatus>>28) {
     case 1:
@@ -742,6 +743,7 @@ _UTF7GetName(const UConverter *cnv) {
         return "UTF-7";
     }
 }
+U_CDECL_END
 
 static const UConverterImpl _UTF7Impl={
     UCNV_UTF7,
@@ -888,7 +890,8 @@ const UConverterSharedData _UTF7Data=
  * ignore bits 31..25
  */
 
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 _IMAPToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                           UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -1156,7 +1159,7 @@ endloop:
     return;
 }
 
-static void
+static void U_CALLCONV
 _IMAPFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
                             UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -1442,6 +1445,7 @@ unicodeMode:
     pArgs->offsets=offsets;
     return;
 }
+U_CDECL_END
 
 static const UConverterImpl _IMAPImpl={
     UCNV_IMAP_MAILBOX,
diff --git a/icu4c/source/common/ucnv_u8.cpp b/icu4c/source/common/ucnv_u8.cpp
index b23e4e71365..4419381fd6c 100644
--- a/icu4c/source/common/ucnv_u8.cpp
+++ b/icu4c/source/common/ucnv_u8.cpp
@@ -97,8 +97,8 @@ static UBool hasCESU8Data(const UConverter *cnv)
     return (UBool)(cnv->sharedData == &_CESU8Data);
 #endif
 }
-
-static void ucnv_toUnicode_UTF8 (UConverterToUnicodeArgs * args,
+U_CDECL_BEGIN
+static void  U_CALLCONV ucnv_toUnicode_UTF8 (UConverterToUnicodeArgs * args,
                                   UErrorCode * err)
 {
     UConverter *cnv = args->converter;
@@ -226,7 +226,7 @@ donefornow:
     args->source = (const char *) mySource;
 }
 
-static void ucnv_toUnicode_UTF8_OFFSETS_LOGIC (UConverterToUnicodeArgs * args,
+static void  U_CALLCONV ucnv_toUnicode_UTF8_OFFSETS_LOGIC (UConverterToUnicodeArgs * args,
                                                 UErrorCode * err)
 {
     UConverter *cnv = args->converter;
@@ -355,8 +355,9 @@ donefornow:
     args->source = (const char *) mySource;
     args->offsets = myOffsets;
 }
+U_CDECL_END
 
-U_CFUNC void ucnv_fromUnicode_UTF8 (UConverterFromUnicodeArgs * args,
+U_CFUNC void  U_CALLCONV ucnv_fromUnicode_UTF8 (UConverterFromUnicodeArgs * args,
                                     UErrorCode * err)
 {
     UConverter *cnv = args->converter;
@@ -470,7 +471,7 @@ lowsurrogate:
     args->source = mySource;
 }
 
-U_CFUNC void ucnv_fromUnicode_UTF8_OFFSETS_LOGIC (UConverterFromUnicodeArgs * args,
+U_CFUNC void  U_CALLCONV ucnv_fromUnicode_UTF8_OFFSETS_LOGIC (UConverterFromUnicodeArgs * args,
                                                   UErrorCode * err)
 {
     UConverter *cnv = args->converter;
@@ -609,7 +610,8 @@ lowsurrogate:
     args->offsets = myOffsets;
 }
 
-static UChar32 ucnv_getNextUChar_UTF8(UConverterToUnicodeArgs *args,
+U_CDECL_BEGIN
+static UChar32 U_CALLCONV ucnv_getNextUChar_UTF8(UConverterToUnicodeArgs *args,
                                                UErrorCode *err) {
     UConverter *cnv;
     const uint8_t *sourceInitial;
@@ -751,6 +753,7 @@ static UChar32 ucnv_getNextUChar_UTF8(UConverterToUnicodeArgs *args,
     *err = U_ILLEGAL_CHAR_FOUND;
     return 0xffff;
 } 
+U_CDECL_END
 
 /* UTF-8-from-UTF-8 conversion functions ------------------------------------ */
 
@@ -762,8 +765,9 @@ utf8_minLegal[5]={ 0, 0, 0x80, 0x800, 0x10000 };
 static const UChar32
 utf8_offsets[7]={ 0, 0, 0x3080, 0xE2080, 0x3C82080 };
 
+U_CDECL_BEGIN
 /* "Convert" UTF-8 to UTF-8: Validate and copy. Modified from ucnv_DBCSFromUTF8(). */
-static void
+static void U_CALLCONV
 ucnv_UTF8FromUTF8(UConverterFromUnicodeArgs *pFromUArgs,
                   UConverterToUnicodeArgs *pToUArgs,
                   UErrorCode *pErrorCode) {
@@ -1008,6 +1012,8 @@ moreBytes:
     pFromUArgs->target=(char *)target;
 }
 
+U_CDECL_END
+
 /* UTF-8 converter data ----------------------------------------------------- */
 
 static const UConverterImpl _UTF8Impl={
diff --git a/icu4c/source/common/ucnvhz.cpp b/icu4c/source/common/ucnvhz.cpp
index 7dac67c87a6..79a83d759f1 100644
--- a/icu4c/source/common/ucnvhz.cpp
+++ b/icu4c/source/common/ucnvhz.cpp
@@ -67,8 +67,8 @@ typedef struct{
 }UConverterDataHZ;
 
 
-
-static void 
+U_CDECL_BEGIN
+static void  U_CALLCONV
 _HZOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
     UConverter *gbConverter;
     if(pArgs->onlyTestIsLoadable) {
@@ -94,7 +94,7 @@ _HZOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
     }
 }
 
-static void 
+static void  U_CALLCONV
 _HZClose(UConverter *cnv){
     if(cnv->extraInfo != NULL) {
         ucnv_close (((UConverterDataHZ *) (cnv->extraInfo))->gbConverter);
@@ -105,7 +105,7 @@ _HZClose(UConverter *cnv){
     }
 }
 
-static void 
+static void  U_CALLCONV
 _HZReset(UConverter *cnv, UConverterResetChoice choice){
     if(choice<=UCNV_RESET_TO_UNICODE) {
         cnv->toUnicodeStatus = 0;
@@ -152,7 +152,7 @@ _HZReset(UConverter *cnv, UConverterResetChoice choice){
 */
 
 
-static void 
+static void  U_CALLCONV
 UConverter_toUnicode_HZ_OFFSETS_LOGIC(UConverterToUnicodeArgs *args,
                                                             UErrorCode* err){
     char tempBuf[2];
@@ -332,7 +332,7 @@ UConverter_toUnicode_HZ_OFFSETS_LOGIC(UConverterToUnicodeArgs *args,
 }
 
 
-static void 
+static void  U_CALLCONV
 UConverter_fromUnicode_HZ_OFFSETS_LOGIC (UConverterFromUnicodeArgs * args,
                                                       UErrorCode * err){
     const UChar *mySource = args->source;
@@ -496,7 +496,7 @@ getTrail:
     myConverterData->isTargetUCharDBCS = isTargetUCharDBCS;
 }
 
-static void
+static void U_CALLCONV
 _HZ_WriteSub(UConverterFromUnicodeArgs *args, int32_t offsetIndex, UErrorCode *err) {
     UConverter *cnv = args->converter;
     UConverterDataHZ *convData=(UConverterDataHZ *) cnv->extraInfo;
@@ -535,7 +535,7 @@ struct cloneHZStruct
 };
 
 
-static UConverter * 
+static UConverter *  U_CALLCONV
 _HZ_SafeClone(const UConverter *cnv, 
               void *stackBuffer, 
               int32_t *pBufferSize, 
@@ -568,7 +568,7 @@ _HZ_SafeClone(const UConverter *cnv,
     return &localClone->cnv;
 }
 
-static void
+static void U_CALLCONV
 _HZ_GetUnicodeSet(const UConverter *cnv,
                   const USetAdder *sa,
                   UConverterUnicodeSet which,
@@ -582,7 +582,7 @@ _HZ_GetUnicodeSet(const UConverter *cnv,
         sa, which, UCNV_SET_FILTER_HZ,
         pErrorCode);
 }
-
+U_CDECL_END
 static const UConverterImpl _HZImpl={
 
     UCNV_HZ,
diff --git a/icu4c/source/common/ucnvisci.cpp b/icu4c/source/common/ucnvisci.cpp
index 7fbc4d7a0c7..27a3a3124ad 100644
--- a/icu4c/source/common/ucnvisci.cpp
+++ b/icu4c/source/common/ucnvisci.cpp
@@ -186,8 +186,9 @@ isPNJBindiTippi(UChar32 c) {
         return (UBool)(pnjMap[c - 0xa00] >> 1);
     }
 }
-
-static void _ISCIIOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode) {
+U_CDECL_BEGIN
+static void  U_CALLCONV
+_ISCIIOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode) {
     if(pArgs->onlyTestIsLoadable) {
         return;
     }
@@ -231,7 +232,8 @@ static void _ISCIIOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *e
     }
 }
 
-static void _ISCIIClose(UConverter *cnv) {
+static void U_CALLCONV
+_ISCIIClose(UConverter *cnv) {
     if (cnv->extraInfo!=NULL) {
         if (!cnv->isExtraLocal) {
             uprv_free(cnv->extraInfo);
@@ -240,7 +242,8 @@ static void _ISCIIClose(UConverter *cnv) {
     }
 }
 
-static const char* _ISCIIgetName(const UConverter* cnv) {
+static const char*  U_CALLCONV
+_ISCIIgetName(const UConverter* cnv) {
     if (cnv->extraInfo) {
         UConverterDataISCII* myData= (UConverterDataISCII*)cnv->extraInfo;
         return myData->name;
@@ -248,7 +251,8 @@ static const char* _ISCIIgetName(const UConverter* cnv) {
     return NULL;
 }
 
-static void _ISCIIReset(UConverter *cnv, UConverterResetChoice choice) {
+static void U_CALLCONV
+_ISCIIReset(UConverter *cnv, UConverterResetChoice choice) {
     UConverterDataISCII* data =(UConverterDataISCII *) (cnv->extraInfo);
     if (choice<=UCNV_RESET_TO_UNICODE) {
         cnv->toUnicodeStatus = missingCharMarker;
@@ -888,8 +892,8 @@ static const uint16_t nuktaSpecialCases[][2]={
  *    Soft Halant :
  *                      <HALANT> + <ZWJ>
  */
-
-static void UConverter_fromUnicode_ISCII_OFFSETS_LOGIC(
+static void U_CALLCONV
+UConverter_fromUnicode_ISCII_OFFSETS_LOGIC(
         UConverterFromUnicodeArgs * args, UErrorCode * err) {
     const UChar *source = args->source;
     const UChar *sourceLimit = args->sourceLimit;
@@ -1172,7 +1176,8 @@ static const uint16_t lookupTable[][2]={
  *
  */
 
-static void UConverter_toUnicode_ISCII_OFFSETS_LOGIC(UConverterToUnicodeArgs *args, UErrorCode* err) {
+static void U_CALLCONV
+UConverter_toUnicode_ISCII_OFFSETS_LOGIC(UConverterToUnicodeArgs *args, UErrorCode* err) {
     const char *source = ( char *) args->source;
     UChar *target = args->target;
     const char *sourceLimit = args->sourceLimit;
@@ -1522,7 +1527,7 @@ struct cloneISCIIStruct {
     UConverterDataISCII mydata;
 };
 
-static UConverter *
+static UConverter * U_CALLCONV
 _ISCII_SafeClone(const UConverter *cnv,
               void *stackBuffer,
               int32_t *pBufferSize,
@@ -1550,7 +1555,7 @@ _ISCII_SafeClone(const UConverter *cnv,
     return &localClone->cnv;
 }
 
-static void
+static void U_CALLCONV
 _ISCIIGetUnicodeSet(const UConverter *cnv,
                     const USetAdder *sa,
                     UConverterUnicodeSet which,
@@ -1579,7 +1584,7 @@ _ISCIIGetUnicodeSet(const UConverter *cnv,
     sa->add(sa->set, ZWNJ);
     sa->add(sa->set, ZWJ);
 }
-
+U_CDECL_END
 static const UConverterImpl _ISCIIImpl={
 
     UCNV_ISCII,
diff --git a/icu4c/source/common/ucnvlat1.cpp b/icu4c/source/common/ucnvlat1.cpp
index bc7c1a44994..8aa5456b8cf 100644
--- a/icu4c/source/common/ucnvlat1.cpp
+++ b/icu4c/source/common/ucnvlat1.cpp
@@ -30,7 +30,8 @@
 /* ISO 8859-1 --------------------------------------------------------------- */
 
 /* This is a table-less and callback-less version of ucnv_MBCSSingleToBMPWithOffsets(). */
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 _Latin1ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                             UErrorCode *pErrorCode) {
     const uint8_t *source;
@@ -116,7 +117,7 @@ _Latin1ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
 }
 
 /* This is a table-less and callback-less version of ucnv_MBCSSingleGetNextUChar(). */
-static UChar32
+static UChar32 U_CALLCONV
 _Latin1GetNextUChar(UConverterToUnicodeArgs *pArgs,
                     UErrorCode *pErrorCode) {
     const uint8_t *source=(const uint8_t *)pArgs->source;
@@ -131,7 +132,7 @@ _Latin1GetNextUChar(UConverterToUnicodeArgs *pArgs,
 }
 
 /* This is a table-less version of ucnv_MBCSSingleFromBMPWithOffsets(). */
-static void
+static void U_CALLCONV
 _Latin1FromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
                               UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -318,7 +319,7 @@ noMoreInput:
 }
 
 /* Convert UTF-8 to Latin-1. Adapted from ucnv_SBCSFromUTF8(). */
-static void
+static void U_CALLCONV
 ucnv_Latin1FromUTF8(UConverterFromUnicodeArgs *pFromUArgs,
                     UConverterToUnicodeArgs *pToUArgs,
                     UErrorCode *pErrorCode) {
@@ -416,7 +417,7 @@ ucnv_Latin1FromUTF8(UConverterFromUnicodeArgs *pFromUArgs,
     pFromUArgs->target=(char *)target;
 }
 
-static void
+static void U_CALLCONV
 _Latin1GetUnicodeSet(const UConverter *cnv,
                      const USetAdder *sa,
                      UConverterUnicodeSet which,
@@ -426,6 +427,8 @@ _Latin1GetUnicodeSet(const UConverter *cnv,
     (void)pErrorCode;
     sa->addRange(sa->set, 0, 0xff);
 }
+U_CDECL_END
+
 
 static const UConverterImpl _Latin1Impl={
     UCNV_LATIN_1,
@@ -468,8 +471,9 @@ const UConverterSharedData _Latin1Data=
 
 /* US-ASCII ----------------------------------------------------------------- */
 
+U_CDECL_BEGIN
 /* This is a table-less version of ucnv_MBCSSingleToBMPWithOffsets(). */
-static void
+static void U_CALLCONV
 _ASCIIToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                            UErrorCode *pErrorCode) {
     const uint8_t *source, *sourceLimit;
@@ -578,7 +582,7 @@ _ASCIIToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
 }
 
 /* This is a table-less version of ucnv_MBCSSingleGetNextUChar(). */
-static UChar32
+static UChar32 U_CALLCONV
 _ASCIIGetNextUChar(UConverterToUnicodeArgs *pArgs,
                    UErrorCode *pErrorCode) {
     const uint8_t *source;
@@ -605,7 +609,7 @@ _ASCIIGetNextUChar(UConverterToUnicodeArgs *pArgs,
 }
 
 /* "Convert" UTF-8 to US-ASCII: Validate and copy. */
-static void
+static void U_CALLCONV
 ucnv_ASCIIFromUTF8(UConverterFromUnicodeArgs *pFromUArgs,
                    UConverterToUnicodeArgs *pToUArgs,
                    UErrorCode *pErrorCode) {
@@ -693,7 +697,7 @@ ucnv_ASCIIFromUTF8(UConverterFromUnicodeArgs *pFromUArgs,
     pFromUArgs->target=(char *)target;
 }
 
-static void
+static void U_CALLCONV
 _ASCIIGetUnicodeSet(const UConverter *cnv,
                     const USetAdder *sa,
                     UConverterUnicodeSet which,
@@ -703,6 +707,7 @@ _ASCIIGetUnicodeSet(const UConverter *cnv,
     (void)pErrorCode;
     sa->addRange(sa->set, 0, 0x7f);
 }
+U_CDECL_END
 
 static const UConverterImpl _ASCIIImpl={
     UCNV_US_ASCII,
diff --git a/icu4c/source/common/ucnvscsu.cpp b/icu4c/source/common/ucnvscsu.cpp
index 851c70763db..74b5722b975 100644
--- a/icu4c/source/common/ucnvscsu.cpp
+++ b/icu4c/source/common/ucnvscsu.cpp
@@ -154,8 +154,8 @@ enum {
 };
 
 /* SCSU setup functions ----------------------------------------------------- */
-
-static void
+U_CDECL_BEGIN
+static void U_CALLCONV
 _SCSUReset(UConverter *cnv, UConverterResetChoice choice) {
     SCSUData *scsu=(SCSUData *)cnv->extraInfo;
 
@@ -191,7 +191,7 @@ _SCSUReset(UConverter *cnv, UConverterResetChoice choice) {
     }
 }
 
-static void
+static void U_CALLCONV
 _SCSUOpen(UConverter *cnv,
           UConverterLoadArgs *pArgs,
           UErrorCode *pErrorCode) {
@@ -216,7 +216,7 @@ _SCSUOpen(UConverter *cnv,
     cnv->subCharLen=-1;
 }
 
-static void
+static void U_CALLCONV
 _SCSUClose(UConverter *cnv) {
     if(cnv->extraInfo!=NULL) {
         if(!cnv->isExtraLocal) {
@@ -228,7 +228,7 @@ _SCSUClose(UConverter *cnv) {
 
 /* SCSU-to-Unicode conversion functions ------------------------------------- */
 
-static void
+static void U_CALLCONV
 _SCSUToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs,
                           UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -582,7 +582,7 @@ endloop:
  * re-copy the original function and remove the variables
  * offsets, sourceIndex, and nextSourceIndex.
  */
-static void
+static void U_CALLCONV
 _SCSUToUnicode(UConverterToUnicodeArgs *pArgs,
                UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -866,7 +866,7 @@ endloop:
     pArgs->target=target;
     return;
 }
-
+U_CDECL_END
 /* SCSU-from-Unicode conversion functions ----------------------------------- */
 
 /*
@@ -989,7 +989,7 @@ getDynamicOffset(uint32_t c, uint32_t *pOffset) {
         return -1;
     }
 }
-
+U_CDECL_BEGIN
 /*
  * Idea for compression:
  *  - save SCSUData and other state before really starting work
@@ -1007,7 +1007,7 @@ getDynamicOffset(uint32_t c, uint32_t *pOffset) {
  *  - Only replace the result after an SDX or SCU?
  */
 
-static void
+static void U_CALLCONV
 _SCSUFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
                             UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -1515,7 +1515,7 @@ outputBytes:
  * re-copy the original function and remove the variables
  * offsets, sourceIndex, and nextSourceIndex.
  */
-static void
+static void U_CALLCONV
 _SCSUFromUnicode(UConverterFromUnicodeArgs *pArgs,
                  UErrorCode *pErrorCode) {
     UConverter *cnv;
@@ -1949,7 +1949,7 @@ outputBytes:
 
 /* miscellaneous ------------------------------------------------------------ */
 
-static const char *
+static const char *  U_CALLCONV
 _SCSUGetName(const UConverter *cnv) {
     SCSUData *scsu=(SCSUData *)cnv->extraInfo;
 
@@ -1968,7 +1968,7 @@ struct cloneSCSUStruct
     SCSUData mydata;
 };
 
-static UConverter * 
+static UConverter *  U_CALLCONV
 _SCSUSafeClone(const UConverter *cnv, 
                void *stackBuffer, 
                int32_t *pBufferSize, 
@@ -1995,7 +1995,7 @@ _SCSUSafeClone(const UConverter *cnv,
 
     return &localClone->cnv;
 }
-
+U_CDECL_END
 
 static const UConverterImpl _SCSUImpl={
     UCNV_SCSU,
diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390
index dbc3a3a5a7a..efcb5b4c035 100644
--- a/icu4c/source/config/mh-os390
+++ b/icu4c/source/config/mh-os390
@@ -69,7 +69,7 @@ SHAREDLIBCXXFLAGS	= -Wc,expo
 # NOCSECT might be used as an optimization option.
 # -+ means accept any file extension as a C++ file. By default only .C is accepted.
 CFLAGS          += -Wc,DLL,ROS,RENT,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'LANGLVL(EXTENDED)' $(ICU_IEEE)
-CXXFLAGS        += -Wc,DLL,ROS,RTTI,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'LANGLVL(EXTENDED)' $(ICU_IEEE) -+
+CXXFLAGS        += -Wc,DLL,ROS,RTTI,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'LANGLVL(EXTENDED0X)' $(ICU_IEEE) -+
 ARFLAGS         = -cr
 
 # _MSE_PROTOS usually interacts with _XOPEN_SOURCE. It affects some standard
diff --git a/icu4c/source/i18n/rbnf.cpp b/icu4c/source/i18n/rbnf.cpp
index 08d6962048f..fd6fea8ded7 100644
--- a/icu4c/source/i18n/rbnf.cpp
+++ b/icu4c/source/i18n/rbnf.cpp
@@ -1259,7 +1259,7 @@ RuleBasedNumberFormat::format(int64_t number, NFRuleSet *ruleSet, UnicodeString&
     // for formatting
 
     if (U_SUCCESS(status)) {
-        if (number == INT64_MIN) {
+        if (number == U_INT64_MIN) {
             // We can't handle this value right now. Provide an accurate default value.
 
             // TODO this section should probably be optimized. The DecimalFormat is shared in ICU4J.
diff --git a/icu4c/source/tools/toolutil/pkg_gencmn.cpp b/icu4c/source/tools/toolutil/pkg_gencmn.cpp
index f551da62d42..423e4b7363c 100644
--- a/icu4c/source/tools/toolutil/pkg_gencmn.cpp
+++ b/icu4c/source/tools/toolutil/pkg_gencmn.cpp
@@ -103,8 +103,10 @@ addFile(const char *filename, const char *name, const char *source, UBool source
 static char *
 allocString(uint32_t length);
 
+U_CDECL_BEGIN
 static int
 compareFiles(const void *file1, const void *file2);
+U_CDECL_END
 
 static char *
 pathToFullPath(const char *path, const char *source);
@@ -548,11 +550,13 @@ pathToFullPath(const char *path, const char *source) {
     return fullPath;
 }
 
+U_CDECL_BEGIN
 static int
 compareFiles(const void *file1, const void *file2) {
     /* sort by basename */
     return uprv_strcmp(((File *)file1)->basename, ((File *)file2)->basename);
 }
+U_CDECL_END
 
 static void
 fixDirToTreePath(char *s)
diff --git a/icu4c/source/tools/toolutil/ucm.cpp b/icu4c/source/tools/toolutil/ucm.cpp
index 4e4399ff39e..28c3f3f4f89 100644
--- a/icu4c/source/tools/toolutil/ucm.cpp
+++ b/icu4c/source/tools/toolutil/ucm.cpp
@@ -199,9 +199,9 @@ compareMappings(UCMTable *lTable, const UCMapping *l,
     /* compare the flags */
     return l->f-r->f;
 }
-
+U_CDECL_BEGIN
 /* sorting by Unicode first sorts mappings directly */
-static int32_t
+static int32_t  U_CALLCONV
 compareMappingsUnicodeFirst(const void *context, const void *left, const void *right) {
     return compareMappings(
         (UCMTable *)context, (const UCMapping *)left,
@@ -209,7 +209,7 @@ compareMappingsUnicodeFirst(const void *context, const void *left, const void *r
 }
 
 /* sorting by bytes first sorts the reverseMap; use indirection to mappings */
-static int32_t
+static int32_t U_CALLCONV
 compareMappingsBytesFirst(const void *context, const void *left, const void *right) {
     UCMTable *table=(UCMTable *)context;
     int32_t l=*(const int32_t *)left, r=*(const int32_t *)right;
@@ -217,6 +217,7 @@ compareMappingsBytesFirst(const void *context, const void *left, const void *rig
         table, table->mappings+l,
         table, table->mappings+r, FALSE);
 }
+U_CDECL_END
 
 U_CAPI void U_EXPORT2
 ucm_sortTable(UCMTable *t) {
diff --git a/icu4c/source/tools/toolutil/ucmstate.cpp b/icu4c/source/tools/toolutil/ucmstate.cpp
index f27d1be98c9..fd461c20da9 100644
--- a/icu4c/source/tools/toolutil/ucmstate.cpp
+++ b/icu4c/source/tools/toolutil/ucmstate.cpp
@@ -916,11 +916,13 @@ compactToUnicodeHelper(UCMStates *states,
     }
 }
 
-static int32_t
+U_CDECL_BEGIN
+static int32_t U_CALLCONV
 compareFallbacks(const void *context, const void *fb1, const void *fb2) {
     (void)context;
     return ((const _MBCSToUFallback *)fb1)->offset-((const _MBCSToUFallback *)fb2)->offset;
 }
+U_CDECL_END
 
 U_CAPI void U_EXPORT2
 ucm_optimizeStates(UCMStates *states,