You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-23 15:16:17 +00:00
Update HarfBuzz, ICU and FreeType
HarfBuzz: Update to version 7.3.0 ICU4C: Update to version 73.1 FreeType: Update to version 2.13.0
This commit is contained in:
12
thirdparty/icu4c/common/ucat.cpp
vendored
12
thirdparty/icu4c/common/ucat.cpp
vendored
@@ -43,18 +43,18 @@ u_catopen(const char* name, const char* locale, UErrorCode* ec) {
|
||||
|
||||
U_CAPI void U_EXPORT2
|
||||
u_catclose(u_nl_catd catd) {
|
||||
ures_close((UResourceBundle*) catd); /* may be NULL */
|
||||
ures_close((UResourceBundle*) catd); /* may be nullptr */
|
||||
}
|
||||
|
||||
U_CAPI const UChar* U_EXPORT2
|
||||
U_CAPI const char16_t* U_EXPORT2
|
||||
u_catgets(u_nl_catd catd, int32_t set_num, int32_t msg_num,
|
||||
const UChar* s,
|
||||
const char16_t* s,
|
||||
int32_t* len, UErrorCode* ec) {
|
||||
|
||||
char key[MAX_KEY_LEN];
|
||||
const UChar* result;
|
||||
const char16_t* result;
|
||||
|
||||
if (ec == NULL || U_FAILURE(*ec)) {
|
||||
if (ec == nullptr || U_FAILURE(*ec)) {
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ u_catgets(u_nl_catd catd, int32_t set_num, int32_t msg_num,
|
||||
|
||||
ERROR:
|
||||
/* In case of any failure, return s */
|
||||
if (len != NULL) {
|
||||
if (len != nullptr) {
|
||||
*len = u_strlen(s);
|
||||
}
|
||||
return s;
|
||||
|
||||
Reference in New Issue
Block a user