Skip to content

Commit

Permalink
Support Time Zone IANA Ids and Windows Ids in all platforms (#49412)
Browse files Browse the repository at this point in the history 
* Support Time Zone IANA Ids <-> Windows Ids conversions
  • Loading branch information
@tarekgh
tarekgh authored Mar 12, 2021
1 parent 4e36716 commit 9fbaf19
Show file tree
Hide file tree
Showing 11 changed files with 332 additions and 113 deletions.
6 changes: 6 additions & 0 deletions src/libraries/Common/src/Interop/Interop.TimeZoneInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,11 @@ internal static extern unsafe ResultCode GetTimeZoneDisplayName(
TimeZoneDisplayNameType type,
char* result,
int resultLength);

[DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_WindowsIdToIanaId")]
internal static extern unsafe int WindowsIdToIanaId(string windowsId, char* ianaId, int ianaIdLength);

[DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IanaIdToWindowsId")]
internal static extern unsafe int IanaIdToWindowsId(string ianaId, char* windowsId, int windowsIdLength);
}
}
2 changes: 2 additions & 0 deletions src/libraries/Native/Unix/System.Globalization.Native/entrypoints.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ static const Entry s_globalizationNative[] =
DllImportEntry(GlobalizationNative_GetSortKey)
DllImportEntry(GlobalizationNative_GetSortVersion)
DllImportEntry(GlobalizationNative_GetTimeZoneDisplayName)
DllImportEntry(GlobalizationNative_IanaIdToWindowsId)
DllImportEntry(GlobalizationNative_IndexOf)
DllImportEntry(GlobalizationNative_InitICUFunctions)
DllImportEntry(GlobalizationNative_InitOrdinalCasingPage)
Expand All @@ -53,6 +54,7 @@ static const Entry s_globalizationNative[] =
DllImportEntry(GlobalizationNative_StartsWith)
DllImportEntry(GlobalizationNative_ToAscii)
DllImportEntry(GlobalizationNative_ToUnicode)
DllImportEntry(GlobalizationNative_WindowsIdToIanaId)
};

EXTERN_C const void* GlobalizationResolveDllImport(const char* name);
Expand Down
16 changes: 8 additions & 8 deletions src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "pal_icushim.h"

// Define pointers to all the used ICU functions
#define PER_FUNCTION_BLOCK(fn, lib) TYPEOF(fn)* fn##_ptr;
#define PER_FUNCTION_BLOCK(fn, lib, required) TYPEOF(fn)* fn##_ptr;
FOR_ALL_ICU_FUNCTIONS
#undef PER_FUNCTION_BLOCK

Expand All @@ -41,14 +41,14 @@ static void* libicui18n = NULL;

#if defined (TARGET_UNIX)

#define PER_FUNCTION_BLOCK(fn, lib) \
#define PER_FUNCTION_BLOCK(fn, lib, required) \
c_static_assert_msg((sizeof(#fn) + MaxICUVersionStringWithSuffixLength + 1) <= sizeof(symbolName), "The symbolName is too small for symbol " #fn); \
sprintf(symbolName, #fn "%s", symbolVersion); \
fn##_ptr = (TYPEOF(fn)*)dlsym(lib, symbolName); \
if (fn##_ptr == NULL) { fprintf(stderr, "Cannot get symbol %s from " #lib "\nError: %s\n", symbolName, dlerror()); abort(); }
if (fn##_ptr == NULL && required) { fprintf(stderr, "Cannot get symbol %s from " #lib "\nError: %s\n", symbolName, dlerror()); abort(); }

static int FindSymbolVersion(int majorVer, int minorVer, int subVer, char* symbolName, char* symbolVersion, char* suffix)
{
{
// Find out the format of the version string added to each symbol
// First try just the unversioned symbol
if (dlsym(libicuuc, "u_strlen") == NULL)
Expand Down Expand Up @@ -89,10 +89,10 @@ static int FindSymbolVersion(int majorVer, int minorVer, int subVer, char* symbo

#define sscanf sscanf_s

#define PER_FUNCTION_BLOCK(fn, lib) \
#define PER_FUNCTION_BLOCK(fn, lib, required) \
sprintf_s(symbolName, SYMBOL_NAME_SIZE, #fn "%s", symbolVersion); \
fn##_ptr = (TYPEOF(fn)*)GetProcAddress((HMODULE)lib, symbolName); \
if (fn##_ptr == NULL) { fprintf(stderr, "Cannot get symbol %s from " #lib "\nError: %u\n", symbolName, GetLastError()); abort(); }
if (fn##_ptr == NULL && required) { fprintf(stderr, "Cannot get symbol %s from " #lib "\nError: %u\n", symbolName, GetLastError()); abort(); }

static int FindICULibs()
{
Expand Down Expand Up @@ -421,7 +421,7 @@ void GlobalizationNative_InitICUFunctions(void* icuuc, void* icuin, const char*
assert(icuuc != NULL);
assert(icuin != NULL);
assert(version != NULL);

libicuuc = icuuc;
libicui18n = icuin;
int major = -1;
Expand Down Expand Up @@ -476,7 +476,7 @@ int32_t GlobalizationNative_GetICUVersion()
{
if (u_getVersion_ptr == NULL)
return 0;

UVersionInfo versionInfo;
u_getVersion(versionInfo);

Expand Down
227 changes: 125 additions & 102 deletions src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,132 +53,148 @@
#include "pal_compiler.h"

#if !defined(STATIC_ICU)

#if !defined(TARGET_ANDROID)
// (U_ICU_VERSION_MAJOR_NUM < 52)
// The following APIs are not supported in the ICU versions less than 52. We need to define them manually.
// We have to do runtime check before using the pointers to these APIs. That is why these are listed in the FOR_ALL_OPTIONAL_ICU_FUNCTIONS list.
U_CAPI int32_t U_EXPORT2 ucal_getWindowsTimeZoneID(const UChar* id, int32_t len,UChar* winid, int32_t winidCapacity, UErrorCode* status);
U_CAPI int32_t U_EXPORT2 ucal_getTimeZoneIDForWindowsID(const UChar* winid, int32_t len, const char* region, UChar* id, int32_t idCapacity, UErrorCode* status);
#endif

// List of all functions from the ICU libraries that are used in the System.Globalization.Native.so
#define FOR_ALL_UNCONDITIONAL_ICU_FUNCTIONS \
PER_FUNCTION_BLOCK(u_charsToUChars, libicuuc) \
PER_FUNCTION_BLOCK(u_getVersion, libicuuc) \
PER_FUNCTION_BLOCK(u_strlen, libicuuc) \
PER_FUNCTION_BLOCK(u_strncpy, libicuuc) \
PER_FUNCTION_BLOCK(u_tolower, libicuuc) \
PER_FUNCTION_BLOCK(u_toupper, libicuuc) \
PER_FUNCTION_BLOCK(ucal_add, libicui18n) \
PER_FUNCTION_BLOCK(ucal_close, libicui18n) \
PER_FUNCTION_BLOCK(ucal_get, libicui18n) \
PER_FUNCTION_BLOCK(ucal_getAttribute, libicui18n) \
PER_FUNCTION_BLOCK(ucal_getKeywordValuesForLocale, libicui18n) \
PER_FUNCTION_BLOCK(ucal_getLimit, libicui18n) \
PER_FUNCTION_BLOCK(ucal_getTimeZoneDisplayName, libicui18n) \
PER_FUNCTION_BLOCK(ucal_open, libicui18n) \
PER_FUNCTION_BLOCK(ucal_set, libicui18n) \
PER_FUNCTION_BLOCK(ucol_close, libicui18n) \
PER_FUNCTION_BLOCK(ucol_closeElements, libicui18n) \
PER_FUNCTION_BLOCK(ucol_getOffset, libicui18n) \
PER_FUNCTION_BLOCK(ucol_getRules, libicui18n) \
PER_FUNCTION_BLOCK(ucol_getSortKey, libicui18n) \
PER_FUNCTION_BLOCK(ucol_getStrength, libicui18n) \
PER_FUNCTION_BLOCK(ucol_getVersion, libicui18n) \
PER_FUNCTION_BLOCK(ucol_next, libicui18n) \
PER_FUNCTION_BLOCK(ucol_previous, libicui18n) \
PER_FUNCTION_BLOCK(ucol_open, libicui18n) \
PER_FUNCTION_BLOCK(ucol_openElements, libicui18n) \
PER_FUNCTION_BLOCK(ucol_openRules, libicui18n) \
PER_FUNCTION_BLOCK(ucol_safeClone, libicui18n) \
PER_FUNCTION_BLOCK(ucol_setAttribute, libicui18n) \
PER_FUNCTION_BLOCK(ucol_strcoll, libicui18n) \
PER_FUNCTION_BLOCK(udat_close, libicui18n) \
PER_FUNCTION_BLOCK(udat_countSymbols, libicui18n) \
PER_FUNCTION_BLOCK(udat_getSymbols, libicui18n) \
PER_FUNCTION_BLOCK(udat_open, libicui18n) \
PER_FUNCTION_BLOCK(udat_setCalendar, libicui18n) \
PER_FUNCTION_BLOCK(udat_toPattern, libicui18n) \
PER_FUNCTION_BLOCK(udatpg_close, libicui18n) \
PER_FUNCTION_BLOCK(udatpg_getBestPattern, libicui18n) \
PER_FUNCTION_BLOCK(udatpg_open, libicui18n) \
PER_FUNCTION_BLOCK(uenum_close, libicuuc) \
PER_FUNCTION_BLOCK(uenum_count, libicuuc) \
PER_FUNCTION_BLOCK(uenum_next, libicuuc) \
PER_FUNCTION_BLOCK(uidna_close, libicuuc) \
PER_FUNCTION_BLOCK(uidna_nameToASCII, libicuuc) \
PER_FUNCTION_BLOCK(uidna_nameToUnicode, libicuuc) \
PER_FUNCTION_BLOCK(uidna_openUTS46, libicuuc) \
PER_FUNCTION_BLOCK(uloc_canonicalize, libicuuc) \
PER_FUNCTION_BLOCK(uloc_countAvailable, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getAvailable, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getBaseName, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getCharacterOrientation, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getCountry, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getDefault, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getDisplayCountry, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getDisplayLanguage, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getDisplayName, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getISO3Country, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getISO3Language, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getKeywordValue, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getLanguage, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getLCID, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getName, libicuuc) \
PER_FUNCTION_BLOCK(uloc_getParent, libicuuc) \
PER_FUNCTION_BLOCK(uloc_setKeywordValue, libicuuc) \
PER_FUNCTION_BLOCK(ulocdata_getCLDRVersion, libicui18n) \
PER_FUNCTION_BLOCK(ulocdata_getMeasurementSystem, libicui18n) \
PER_FUNCTION_BLOCK(unorm2_getNFCInstance, libicuuc) \
PER_FUNCTION_BLOCK(unorm2_getNFDInstance, libicuuc) \
PER_FUNCTION_BLOCK(unorm2_getNFKCInstance, libicuuc) \
PER_FUNCTION_BLOCK(unorm2_getNFKDInstance, libicuuc) \
PER_FUNCTION_BLOCK(unorm2_isNormalized, libicuuc) \
PER_FUNCTION_BLOCK(unorm2_normalize, libicuuc) \
PER_FUNCTION_BLOCK(unum_close, libicui18n) \
PER_FUNCTION_BLOCK(unum_getAttribute, libicui18n) \
PER_FUNCTION_BLOCK(unum_getSymbol, libicui18n) \
PER_FUNCTION_BLOCK(unum_open, libicui18n) \
PER_FUNCTION_BLOCK(unum_toPattern, libicui18n) \
PER_FUNCTION_BLOCK(ures_close, libicuuc) \
PER_FUNCTION_BLOCK(ures_getByKey, libicuuc) \
PER_FUNCTION_BLOCK(ures_getSize, libicuuc) \
PER_FUNCTION_BLOCK(ures_getStringByIndex, libicuuc) \
PER_FUNCTION_BLOCK(ures_open, libicuuc) \
PER_FUNCTION_BLOCK(usearch_close, libicui18n) \
PER_FUNCTION_BLOCK(usearch_first, libicui18n) \
PER_FUNCTION_BLOCK(usearch_getMatchedLength, libicui18n) \
PER_FUNCTION_BLOCK(usearch_last, libicui18n) \
PER_FUNCTION_BLOCK(usearch_openFromCollator, libicui18n) \
PER_FUNCTION_BLOCK(usearch_setPattern, libicui18n) \
PER_FUNCTION_BLOCK(usearch_setText, libicui18n)
PER_FUNCTION_BLOCK(u_charsToUChars, libicuuc, true) \
PER_FUNCTION_BLOCK(u_getVersion, libicuuc, true) \
PER_FUNCTION_BLOCK(u_strlen, libicuuc, true) \
PER_FUNCTION_BLOCK(u_strncpy, libicuuc, true) \
PER_FUNCTION_BLOCK(u_tolower, libicuuc, true) \
PER_FUNCTION_BLOCK(u_toupper, libicuuc, true) \
PER_FUNCTION_BLOCK(ucal_add, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_close, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_get, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_getAttribute, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_getKeywordValuesForLocale, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_getLimit, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_getTimeZoneDisplayName, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_open, libicui18n, true) \
PER_FUNCTION_BLOCK(ucal_set, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_close, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_closeElements, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_getOffset, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_getRules, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_getSortKey, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_getStrength, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_getVersion, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_next, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_previous, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_open, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_openElements, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_openRules, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_safeClone, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_setAttribute, libicui18n, true) \
PER_FUNCTION_BLOCK(ucol_strcoll, libicui18n, true) \
PER_FUNCTION_BLOCK(udat_close, libicui18n, true) \
PER_FUNCTION_BLOCK(udat_countSymbols, libicui18n, true) \
PER_FUNCTION_BLOCK(udat_getSymbols, libicui18n, true) \
PER_FUNCTION_BLOCK(udat_open, libicui18n, true) \
PER_FUNCTION_BLOCK(udat_setCalendar, libicui18n, true) \
PER_FUNCTION_BLOCK(udat_toPattern, libicui18n, true) \
PER_FUNCTION_BLOCK(udatpg_close, libicui18n, true) \
PER_FUNCTION_BLOCK(udatpg_getBestPattern, libicui18n, true) \
PER_FUNCTION_BLOCK(udatpg_open, libicui18n, true) \
PER_FUNCTION_BLOCK(uenum_close, libicuuc, true) \
PER_FUNCTION_BLOCK(uenum_count, libicuuc, true) \
PER_FUNCTION_BLOCK(uenum_next, libicuuc, true) \
PER_FUNCTION_BLOCK(uidna_close, libicuuc, true) \
PER_FUNCTION_BLOCK(uidna_nameToASCII, libicuuc, true) \
PER_FUNCTION_BLOCK(uidna_nameToUnicode, libicuuc, true) \
PER_FUNCTION_BLOCK(uidna_openUTS46, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_canonicalize, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_countAvailable, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getAvailable, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getBaseName, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getCharacterOrientation, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getCountry, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getDefault, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getDisplayCountry, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getDisplayLanguage, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getDisplayName, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getISO3Country, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getISO3Language, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getKeywordValue, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getLanguage, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getLCID, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getName, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_getParent, libicuuc, true) \
PER_FUNCTION_BLOCK(uloc_setKeywordValue, libicuuc, true) \
PER_FUNCTION_BLOCK(ulocdata_getCLDRVersion, libicui18n, true) \
PER_FUNCTION_BLOCK(ulocdata_getMeasurementSystem, libicui18n, true) \
PER_FUNCTION_BLOCK(unorm2_getNFCInstance, libicuuc, true) \
PER_FUNCTION_BLOCK(unorm2_getNFDInstance, libicuuc, true) \
PER_FUNCTION_BLOCK(unorm2_getNFKCInstance, libicuuc, true) \
PER_FUNCTION_BLOCK(unorm2_getNFKDInstance, libicuuc, true) \
PER_FUNCTION_BLOCK(unorm2_isNormalized, libicuuc, true) \
PER_FUNCTION_BLOCK(unorm2_normalize, libicuuc, true) \
PER_FUNCTION_BLOCK(unum_close, libicui18n, true) \
PER_FUNCTION_BLOCK(unum_getAttribute, libicui18n, true) \
PER_FUNCTION_BLOCK(unum_getSymbol, libicui18n, true) \
PER_FUNCTION_BLOCK(unum_open, libicui18n, true) \
PER_FUNCTION_BLOCK(unum_toPattern, libicui18n, true) \
PER_FUNCTION_BLOCK(ures_close, libicuuc, true) \
PER_FUNCTION_BLOCK(ures_getByKey, libicuuc, true) \
PER_FUNCTION_BLOCK(ures_getSize, libicuuc, true) \
PER_FUNCTION_BLOCK(ures_getStringByIndex, libicuuc, true) \
PER_FUNCTION_BLOCK(ures_open, libicuuc, true) \
PER_FUNCTION_BLOCK(usearch_close, libicui18n, true) \
PER_FUNCTION_BLOCK(usearch_first, libicui18n, true) \
PER_FUNCTION_BLOCK(usearch_getMatchedLength, libicui18n, true) \
PER_FUNCTION_BLOCK(usearch_last, libicui18n, true) \
PER_FUNCTION_BLOCK(usearch_openFromCollator, libicui18n, true) \
PER_FUNCTION_BLOCK(usearch_setPattern, libicui18n, true) \
PER_FUNCTION_BLOCK(usearch_setText, libicui18n, true)

#if HAVE_SET_MAX_VARIABLE
#define FOR_ALL_SET_VARIABLE_ICU_FUNCTIONS \
PER_FUNCTION_BLOCK(ucol_setMaxVariable, libicui18n)
PER_FUNCTION_BLOCK(ucol_setMaxVariable, libicui18n, true)
#else

#define FOR_ALL_SET_VARIABLE_ICU_FUNCTIONS \
PER_FUNCTION_BLOCK(ucol_setVariableTop, libicui18n)
PER_FUNCTION_BLOCK(ucol_setVariableTop, libicui18n, true)
#endif

#if defined(TARGET_WINDOWS)
#define FOR_ALL_OS_CONDITIONAL_ICU_FUNCTIONS \
PER_FUNCTION_BLOCK(ucurr_forLocale, libicuuc) \
PER_FUNCTION_BLOCK(ucurr_getName, libicuuc) \
PER_FUNCTION_BLOCK(uldn_close, libicuuc) \
PER_FUNCTION_BLOCK(uldn_keyValueDisplayName, libicuuc) \
PER_FUNCTION_BLOCK(uldn_open, libicuuc)
PER_FUNCTION_BLOCK(ucurr_forLocale, libicuuc, true) \
PER_FUNCTION_BLOCK(ucurr_getName, libicuuc, true) \
PER_FUNCTION_BLOCK(uldn_close, libicuuc, true) \
PER_FUNCTION_BLOCK(uldn_keyValueDisplayName, libicuuc, true) \
PER_FUNCTION_BLOCK(uldn_open, libicuuc, true)
#else
// Unix ICU is dynamically resolved at runtime and these APIs in old versions
// of ICU were in libicui18n
#define FOR_ALL_OS_CONDITIONAL_ICU_FUNCTIONS \
PER_FUNCTION_BLOCK(ucurr_forLocale, libicui18n) \
PER_FUNCTION_BLOCK(ucurr_getName, libicui18n) \
PER_FUNCTION_BLOCK(uldn_close, libicui18n) \
PER_FUNCTION_BLOCK(uldn_keyValueDisplayName, libicui18n) \
PER_FUNCTION_BLOCK(uldn_open, libicui18n)
PER_FUNCTION_BLOCK(ucurr_forLocale, libicui18n, true) \
PER_FUNCTION_BLOCK(ucurr_getName, libicui18n, true) \
PER_FUNCTION_BLOCK(uldn_close, libicui18n, true) \
PER_FUNCTION_BLOCK(uldn_keyValueDisplayName, libicui18n, true) \
PER_FUNCTION_BLOCK(uldn_open, libicui18n, true)
#endif

// The following are the list of the ICU APIs which are optional. If these APIs exist in the ICU version we load at runtime, then we'll use it.
// Otherwise, we'll just not provide the functionality to users which needed these APIs.
#define FOR_ALL_OPTIONAL_ICU_FUNCTIONS \
PER_FUNCTION_BLOCK(ucal_getWindowsTimeZoneID, libicui18n, false) \
PER_FUNCTION_BLOCK(ucal_getTimeZoneIDForWindowsID, libicui18n, false)

#define FOR_ALL_ICU_FUNCTIONS \
FOR_ALL_UNCONDITIONAL_ICU_FUNCTIONS \
FOR_ALL_SET_VARIABLE_ICU_FUNCTIONS \
FOR_ALL_OPTIONAL_ICU_FUNCTIONS \
FOR_ALL_OS_CONDITIONAL_ICU_FUNCTIONS

// Declare pointers to all the used ICU functions
#define PER_FUNCTION_BLOCK(fn, lib) EXTERN_C TYPEOF(fn)* fn##_ptr;
#define PER_FUNCTION_BLOCK(fn, lib, required) EXTERN_C TYPEOF(fn)* fn##_ptr;
FOR_ALL_ICU_FUNCTIONS
#undef PER_FUNCTION_BLOCK

Expand All @@ -197,6 +213,8 @@ FOR_ALL_ICU_FUNCTIONS
#define ucal_getKeywordValuesForLocale(...) ucal_getKeywordValuesForLocale_ptr(__VA_ARGS__)
#define ucal_getLimit(...) ucal_getLimit_ptr(__VA_ARGS__)
#define ucal_getTimeZoneDisplayName(...) ucal_getTimeZoneDisplayName_ptr(__VA_ARGS__)
#define ucal_getTimeZoneIDForWindowsID(...) ucal_getTimeZoneIDForWindowsID_ptr(__VA_ARGS__)
#define ucal_getWindowsTimeZoneID(...) ucal_getWindowsTimeZoneID_ptr(__VA_ARGS__)
#define ucal_open(...) ucal_open_ptr(__VA_ARGS__)
#define ucal_set(...) ucal_set_ptr(__VA_ARGS__)
#define ucol_close(...) ucol_close_ptr(__VA_ARGS__)
Expand Down Expand Up @@ -285,4 +303,9 @@ FOR_ALL_ICU_FUNCTIONS
#define usearch_setPattern(...) usearch_setPattern_ptr(__VA_ARGS__)
#define usearch_setText(...) usearch_setText_ptr(__VA_ARGS__)

#else // !defined(STATIC_ICU)

#define ucal_getWindowsTimeZoneID_ptr ucal_getWindowsTimeZoneID
#define ucal_getTimeZoneIDForWindowsID_ptr ucal_getTimeZoneIDForWindowsID

#endif // !defined(STATIC_ICU)
2 changes: 2 additions & 0 deletions src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal_android.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,8 @@ int32_t ucal_getLimit(const UCalendar * cal, UCalendarDateFields field, UCalenda
int32_t ucal_getTimeZoneDisplayName(const UCalendar * cal, UCalendarDisplayNameType type, const char * locale, UChar * result, int32_t resultLength, UErrorCode * status);
UCalendar * ucal_open(const UChar * zoneID, int32_t len, const char * locale, UCalendarType type, UErrorCode * status);
void ucal_set(UCalendar * cal, UCalendarDateFields field, int32_t value);
int32_t ucal_getTimeZoneIDForWindowsID(const UChar * winid, int32_t len, const char * region, UChar * id, int32_t idCapacity, UErrorCode * status);
int32_t ucal_getWindowsTimeZoneID(const UChar * id, int32_t len, UChar * winid, int32_t winidCapacity, UErrorCode * status);
void ucol_close(UCollator * coll);
void ucol_closeElements(UCollationElements * elems);
int32_t ucol_getOffset(const UCollationElements *elems);
Expand Down
Loading

0 comments on commit 9fbaf19

Please sign in to comment.