organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-20 20:19:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-13030 cleanup U_CALLCONV on windows. Also, initialize an uninitialized var

Browse source 
X-SVN-Rev: 40137
This commit is contained in:
Steven R. Loomis 2017-05-24 23:25:33 +00:00
parent 6b9bbb9d9d
commit f1da2f1d9f
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/ucurr.cpp
View file

@ -588,7 +588,7 @@ ucurr_forLocale(const char* locale,
idDelim[0] = 0;
}
const UChar* s; // Currency code from data file.
const UChar* s = NULL; // Currency code from data file.
if (id[0] == 0) {
// No point looking in the data for an empty string.
// This is what we would get.

10
icu4c/source/common/unicode/platform.h
View file

@ -830,6 +830,16 @@ namespace std {
# define U_CALLCONV U_EXPORT2
#endif
/**
* \def U_CALLCONV_FPTR
* Similar to U_CALLCONV, but only used on function pointers.
* @internal
*/
#if U_PLATFORM == U_PF_OS390 && defined(__cplusplus)
# define U_CALLCONV_FPTR U_CALLCONV
#else
# define U_CALLCONV_FPTR
#endif
/* @} */
#endif

2
icu4c/source/common/unicode/uclean.h
View file

@ -149,7 +149,7 @@ typedef void U_CALLCONV UMemFreeFn (const void *context, void *mem);
* @system
*/
U_STABLE void U_EXPORT2
u_setMemoryFunctions(const void *context, UMemAllocFn * U_CALLCONV a, UMemReallocFn * U_CALLCONV r, UMemFreeFn * U_CALLCONV f,
u_setMemoryFunctions(const void *context, UMemAllocFn * U_CALLCONV_FPTR a, UMemReallocFn * U_CALLCONV_FPTR r, UMemFreeFn * U_CALLCONV_FPTR f,
UErrorCode *status);
U_CDECL_END