From aa90970924ab0c99b1f2b3e65aac31ac99174ba2 Mon Sep 17 00:00:00 2001
From: Joakim <git@joakim.fea.st>
Date: Mon, 1 Feb 2016 12:28:20 +0530
Subject: [PATCH] Android tweaks: version out ehTables and add needed clang
 declaration for ARM

---
 src/ldc/arm_unwind.c      | 3 +++
 src/rt/sections_android.d | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ldc/arm_unwind.c b/src/ldc/arm_unwind.c
index e8a8c86c74..beb94021af 100644
--- a/src/ldc/arm_unwind.c
+++ b/src/ldc/arm_unwind.c
@@ -14,6 +14,9 @@
 
 #include <unwind.h>
 
+// clang's unwind.h doesn't have this
+typedef struct _Unwind_Context _Unwind_Context;
+
 _Unwind_Word _d_eh_GetIP(_Unwind_Context *context)
 {
     return _Unwind_GetIP(context);
diff --git a/src/rt/sections_android.d b/src/rt/sections_android.d
index 4fd4a440d0..bcb7520763 100644
--- a/src/rt/sections_android.d
+++ b/src/rt/sections_android.d
@@ -42,7 +42,7 @@ struct SectionGroup
         return _moduleGroup;
     }
 
-    @property immutable(FuncTable)[] ehTables() const
+    version(DigitalMars) @property immutable(FuncTable)[] ehTables() const
     {
         auto pbeg = cast(immutable(FuncTable)*)&_deh_beg;
         auto pend = cast(immutable(FuncTable)*)&_deh_end;