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

[Tor Lillqvist]

 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx |    1 +
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx |    3 ++-
 include/LibreOfficeKit/LibreOfficeKitInit.h           |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 932804559e845fb8ec6ac3a3b49308136a7e81e6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Aug 20 16:14:37 2016 +0300

    Check arm64 too
    
    Change-Id: I51f89eb05f7844a7b0a99eab1587bbe333b96b09

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 15b9a67..322ba8b 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -158,7 +158,7 @@ static void *lok_dlopen( const char *install_path, char ** _imp_lib )
 
     *_imp_lib = NULL;
 
-#if !(defined(__APPLE__) && defined(__arm__))
+#if !(defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)))
     size_t partial_length;
 
     if (!install_path)
commit ef5e3bfc71f94f77ecd13df9afe2fa768b020dbb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Aug 19 20:10:53 2016 +0300

    SAL_FALLTHROUGH
    
    Change-Id: I9b13e20b873e919aef93e5c7548112c47f57612e

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
index 1f77e49..92b053c 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
@@ -402,6 +402,7 @@ namespace
                     TYPELIB_DANGER_RELEASE( pTD );
                 }
             } // else perform queryInterface()
+            SAL_FALLTHROUGH;
             default:
                 eRet = cpp2uno_call(
                     pCppI, aMemberDescr.get(),
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
index 24a5704..4549109 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
@@ -77,7 +77,7 @@ void MapReturn(sal_uInt64 x0, sal_uInt64 x1, typelib_TypeDescriptionReference *p
     case typelib_TypeClass_HYPER:
     case typelib_TypeClass_UNSIGNED_HYPER:
         pRegisterReturn[1] = x1;
-        // fallthrough
+        SAL_FALLTHROUGH;
     case typelib_TypeClass_LONG:
     case typelib_TypeClass_UNSIGNED_LONG:
     case typelib_TypeClass_ENUM:
@@ -525,6 +525,7 @@ void unoInterfaceProxyDispatch(
                 TYPELIB_DANGER_RELEASE( pTD );
             }
         } // else perform queryInterface()
+        SAL_FALLTHROUGH;
         default:
             // dependent dispatch
             cpp_call(