[Libreoffice-commits] core.git: bridges/source

[Miklos Vajna]

 bridges/source/cpp_uno/gcc3_linux_arm/share.hxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit eccca2010bb452380cc16cee5e882ef002057a42
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jun 23 16:31:32 2017 +0200

    bridges: fix Linux/arm for the non-Android case
    
    Change-Id: I8adf22c65515ae23b95e6745c24c41814192811b
    Reviewed-on: https://gerrit.libreoffice.org/39173
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index 492f1b699b9f..7fddd841498b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -23,7 +23,11 @@
 #include <typeinfo>
 #include <exception>
 #include <cstddef>
+#ifndef ANDROID
+#include <unwind.h>
+#else
 #include <unwind-arm.h>
+#endif
 
 #include <cxxabi.h>
 #ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h