From 11ecf0c1796c65132f3f768821c6c097f21c8043 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Mon, 17 Apr 2017 13:59:02 +0300 Subject: [PATCH] Adjust C interop stub names to prevent some symbol name clashes Use `pkg_kni_name` instead of `kni_pkg_name` --- .../jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt index 54400049c0c..56066ce2f78 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt @@ -1188,7 +1188,7 @@ class StubGenerator( private val FunctionDecl.cStubName: String get() { require(platform == KotlinPlatform.NATIVE) - return "kni_" + pkgName.replace('.', '_') + '_' + this.name + return pkgName.replace('.', '_') + "_kni_" + this.name } private val FunctionDecl.kotlinExternalName: String