diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 18:03:48 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 18:21:52 +0200 |
| commit | 42acf7a6d5cf91aed5ed4aa0d9ce09b3d0203b01 (patch) | |
| tree | 2513bb645ff07690648abd267540b2c20d25f11a /bridges | |
| parent | f62c8ecdfce2ac32f82275d27218c1cdb65a6de6 (diff) | |
Don't use USE_DOUBLE_MMAP on Android
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 3 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index 21c335b3b824..c21fb7672bc3 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -39,8 +39,7 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ - || defined(NETBSD) || defined(DRAGONFLY) \ - || defined(ANDROID) /* Not sure about Android, but let's see... */ + || defined(NETBSD) || defined(DRAGONFLY) #define USE_DOUBLE_MMAP #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index 737824c70498..9869bb5c9557 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -488,10 +488,16 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, + Slot ** slots, unsigned char * code, +#ifdef USE_DOUBLE_MMAP + sal_PtrDiff writetoexecdiff, +#endif typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset) { +#ifndef USE_DOUBLE_MMAP + const sal_PtrDiff writetoexecdiff = 0; +#endif (*slots) -= functionCount; Slot * s = *slots; for (sal_Int32 i = 0; i < type->nMembers; ++i) |