Skip to content

Commit 06c2eec

Browse files
Merge pull request #4897 from kateinoigakukun/pr-49cb54aab4ab471cfedde1f6190c8fe926a40c16
[wasm] Port `CoreFoundation/StringEncodings.subproj`
2 parents 64a89bf + 48f2ad0 commit 06c2eec

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

CoreFoundation/StringEncodings.subproj/CFPlatformConverters.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ CF_INLINE bool __CFIsPlatformConverterAvailable(int encoding) {
2727
#endif
2828
}
2929

30-
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX
30+
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
3131

3232
static const CFStringEncodingConverter __CFICUBootstrap = {
3333
.toBytes.standard = NULL,
@@ -65,7 +65,7 @@ CF_PRIVATE const CFStringEncodingConverter *__CFStringEncodingGetExternalConvert
6565
if (__CFIsPlatformConverterAvailable(encoding)) {
6666
return &__CFPlatformBootstrap;
6767
} else {
68-
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX
68+
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
6969
if (__CFStringEncodingGetICUName(encoding)) {
7070
return &__CFICUBootstrap;
7171
}

CoreFoundation/StringEncodings.subproj/CFStringEncodingConverter.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ CF_INLINE _CFEncodingConverter *__CFEncodingConverterFromDefinition(const CFStri
533533
converter->toCanonicalUnicode = __CFToCanonicalUnicodeCheapMultiByteWrapper;
534534
break;
535535

536-
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX
536+
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
537537
case kCFStringEncodingConverterICU:
538538
converter->toBytes = (_CFToBytesProc)__CFStringEncodingGetICUName(encoding);
539539
break;
@@ -699,7 +699,7 @@ uint32_t CFStringEncodingUnicodeToBytes(uint32_t encoding, uint32_t flags, const
699699
}
700700
}
701701

702-
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX
702+
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
703703
if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToBytes((const char *)converter->toBytes, flags, characters, numChars, usedCharLen, bytes, maxByteLen, usedByteLen);
704704
#endif
705705

@@ -844,7 +844,7 @@ uint32_t CFStringEncodingBytesToUnicode(uint32_t encoding, uint32_t flags, const
844844

845845
if (!converter) return kCFStringEncodingConverterUnavailable;
846846

847-
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX
847+
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
848848
if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUToUnicode((const char *)converter->toBytes, flags, bytes, numBytes, usedByteLen, characters, maxCharLen, usedCharLen);
849849
#endif
850850

@@ -888,7 +888,7 @@ CF_PRIVATE CFIndex CFStringEncodingCharLengthForBytes(uint32_t encoding, uint32_
888888
const _CFEncodingConverter *converter = __CFGetConverter(encoding);
889889

890890
if (converter) {
891-
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX
891+
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
892892
if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUCharLength((const char *)converter->toBytes, flags, bytes, numBytes);
893893
#endif
894894

@@ -932,7 +932,7 @@ CF_PRIVATE CFIndex CFStringEncodingByteLengthForCharacters(uint32_t encoding, ui
932932
const _CFEncodingConverter *converter = __CFGetConverter(encoding);
933933

934934
if (converter) {
935-
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX
935+
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
936936
if (kCFStringEncodingConverterICU == converter->definition->encodingClass) return __CFStringEncodingICUByteLength((const char *)converter->toBytes, flags, characters, numChars);
937937
#endif
938938

@@ -1017,7 +1017,7 @@ CF_PRIVATE const CFStringEncoding *CFStringEncodingListOfAvailableEncodings(void
10171017
if (NULL == encodings) {
10181018
CFStringEncoding *list = (CFStringEncoding *)__CFBuiltinEncodings;
10191019
CFIndex numICUConverters = 0, numPlatformConverters = 0;
1020-
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX
1020+
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_WASI
10211021
CFStringEncoding *icuConverters = __CFStringEncodingCreateICUEncodings(NULL, &numICUConverters);
10221022
#else
10231023
CFStringEncoding *icuConverters = NULL;

0 commit comments

Comments
 (0)