azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add iconv void * overloads for backwards compatibility

Browse Source 
Since Xcode 15 the iconv APIs operate on an opaque type __tag_iconv_t* instead of
void*. This causes a runtime exception in older Ktor versions which
depended on iconv.

^KT-62286
This commit is contained in:
Timofey Solonin
2023-10-03 23:05:41 +02:00
parent 057973f4bb
commit 8dc9307f9e
8 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/platformLibs/src/platform/ios/iconv.def
+7
View File
@@ -3,3 +3,10 @@ package = platform.iconv
headers = iconv.h
headerFilter = **
linkerOpts = -liconv
allowedOverloadsForCFunctions = iconv iconvctl iconv_close
---
typedef void* __kotlin_iconv_t;
size_t __attribute__((overloadable)) iconv(__kotlin_iconv_t, char **, size_t *, char **, size_t *) asm("_iconv");
int __attribute__((overloadable)) iconvctl(__kotlin_iconv_t, int, void *) asm("_iconvctl");
int __attribute__((overloadable)) iconv_close(__kotlin_iconv_t) asm("_iconv_close");
kotlin-native/platformLibs/src/platform/osx/iconv.def
+7
View File
@@ -3,3 +3,10 @@ package = platform.iconv
headers = iconv.h
headerFilter = **
linkerOpts = -liconv
allowedOverloadsForCFunctions = iconv iconvctl iconv_close
---
typedef void* __kotlin_iconv_t;
size_t __attribute__((overloadable)) iconv(__kotlin_iconv_t, char **, size_t *, char **, size_t *) asm("_iconv");
int __attribute__((overloadable)) iconvctl(__kotlin_iconv_t, int, void *) asm("_iconvctl");
int __attribute__((overloadable)) iconv_close(__kotlin_iconv_t) asm("_iconv_close");
kotlin-native/platformLibs/src/platform/tvos/iconv.def
+7
View File
@@ -3,3 +3,10 @@ package = platform.iconv
headers = iconv.h
headerFilter = **
linkerOpts = -liconv
allowedOverloadsForCFunctions = iconv iconvctl iconv_close
---
typedef void* __kotlin_iconv_t;
size_t __attribute__((overloadable)) iconv(__kotlin_iconv_t, char **, size_t *, char **, size_t *) asm("_iconv");
int __attribute__((overloadable)) iconvctl(__kotlin_iconv_t, int, void *) asm("_iconvctl");
int __attribute__((overloadable)) iconv_close(__kotlin_iconv_t) asm("_iconv_close");
kotlin-native/platformLibs/src/platform/watchos/iconv.def
+7
View File
@@ -3,3 +3,10 @@ package = platform.iconv
headers = iconv.h
headerFilter = **
linkerOpts = -liconv
allowedOverloadsForCFunctions = iconv iconvctl iconv_close
---
typedef void* __kotlin_iconv_t;
size_t __attribute__((overloadable)) iconv(__kotlin_iconv_t, char **, size_t *, char **, size_t *) asm("_iconv");
int __attribute__((overloadable)) iconvctl(__kotlin_iconv_t, int, void *) asm("_iconvctl");
int __attribute__((overloadable)) iconv_close(__kotlin_iconv_t) asm("_iconv_close");