From 0f20feb54443c240a2f4765411592e3587bdb57b Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Fri, 14 Jul 2017 17:57:26 +0300
Subject: [PATCH] Fix name clashes between struct and typedef in interop

---
 .../jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt   | 3 ++-
 1 file changed, 2 insertions(+), 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 83da5d732a6..259dfcecd34 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
@@ -80,7 +80,8 @@ class StubGenerator(
     val forbiddenStructNames = run {
         val functionNames = nativeIndex.functions.map { it.name }
         val fieldNames = nativeIndex.structs.mapNotNull { it.def }.flatMap { it.fields }.map { it.name }
-        (functionNames + fieldNames).toSet() + keywords
+        val typedefNames = nativeIndex.typedefs.map { it.name }
+        (functionNames + fieldNames + typedefNames).toSet()
     }
 
     val StructDecl.isAnonymous: Boolean