diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-03-11 13:05:57 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-03-11 17:22:03 +0100 |
| commit | 6ec77e28f131a03cd6209ef3de5bd8afb2442086 (patch) | |
| tree | d5a43f46c98ece40d43008dfd46aca7b484792ec /bridges | |
| parent | 813296d4a21163ffba86f1f4c0bec6ddb0511e6c (diff) | |
iOS, revert bed135e02bf7db2ef8c29747bbf79f26da71e9ca
using USE_DOUBLE_MMAP worked well on the device, but caused
problems with the simulator, that depends on the GCC3_MAC* implementation.
Change-Id: Ifbc1d48b3642567029c5271054a545eaacaf18ed
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/inc/vtablefactory.hxx | 2 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx index 04e3addc3149..70c87c385952 100644 --- a/bridges/inc/vtablefactory.hxx +++ b/bridges/inc/vtablefactory.hxx @@ -31,7 +31,7 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ || defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \ - || defined(HAIKU) || defined(IOS) + || defined(HAIKU) #define USE_DOUBLE_MMAP #endif diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx index 8008d3a2193e..0ca1401ba960 100644 --- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx @@ -512,13 +512,11 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( Slot ** slots, unsigned char * code, - sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset) { - (void)writetoexecdiff; (*slots) -= functionCount; Slot * s = *slots; for (sal_Int32 i = 0; i < type->nMembers; ++i) |