[ObjCExport] Proper fix for OBJC_OLD_DISPATCH_PROTOTYPES

DarkMike82 · May 18, 2020 · 2b47ee0 · 2b47ee0
1 parent 37bf7d7
commit 2b47ee0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/....native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt b/....native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt
@@ -377,7 +377,7 @@ internal class ObjCExportCodeGenerator(
         )
     }
 
-    private val impType = pointerType(functionType(int8TypePtr, true, int8TypePtr, int8TypePtr))
+    private val impType = pointerType(functionType(voidType, false))
 
     internal val directMethodAdapters = mutableMapOf<DirectAdapterRequest, ObjCToKotlinMethodAdapter>()
 

diff --git a/runtime/src/main/cpp/ObjCExport.mm b/runtime/src/main/cpp/ObjCExport.mm
@@ -21,8 +21,6 @@
 
 #if KONAN_OBJC_INTEROP
 
-#define OBJC_OLD_DISPATCH_PROTOTYPES 1
-
 #import <Foundation/NSObject.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSString.h>

diff --git a/runtime/src/objc/cpp/ObjCExportClasses.mm b/runtime/src/objc/cpp/ObjCExportClasses.mm
@@ -9,8 +9,6 @@
 
 #if KONAN_OBJC_INTEROP
 
-#define OBJC_OLD_DISPATCH_PROTOTYPES 1
-
 #import <Foundation/NSObject.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSString.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -377,7 +377,7 @@ internal class ObjCExportCodeGenerator( @@
             )
         }
-        private val impType = pointerType(functionType(int8TypePtr, true, int8TypePtr, int8TypePtr))
+        private val impType = pointerType(functionType(voidType, false))
         internal val directMethodAdapters = mutableMapOf<DirectAdapterRequest, ObjCToKotlinMethodAdapter>()
@@ Expand Down @@