diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-01-02 12:43:13 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-01-02 12:49:39 +0200 |
| commit | 0478c43bef0510e3bfedc0f836e3a95635e0d391 (patch) | |
| tree | 5e35a1f8b8df2307b54c95524814fc8dfdfa3a1f | |
| parent | 4d3b725000e537ce6199f0abd1c80580c9bf95c8 (diff) | |
No need for USE_DOUBLE_MMAP on OS X
I had introduced it with d83de4b1a93ba7ed7bc3243073be3de96a44bfa9 in
2012, when the C++/UNO bridge for 64-bit OS X was created mostly as a
copy of the Linux one.
Stephan says that the only need for USE_DOUBLE_MMAP should be on
SELinux anyway, so most likely also its use for the various BSDs and
Android are copypasta or cargo cult.
Change-Id: I1c16e830e5e8269b78b14837a9127a98612a6e54
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 3 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index 5b4b06b4e03c..1e9a48876a10 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -30,8 +30,7 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ - || defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \ - || (defined(MACOSX) && defined(__LP64__)) + || defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) #define USE_DOUBLE_MMAP #endif diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index 5ba5c1ff3c11..663a663168a6 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -459,10 +459,11 @@ 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, typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset, sal_Int32 functionCount, sal_Int32 nVtableOffset ) { + const sal_PtrDiff writetoexecdiff = 0; (*slots) -= functionCount; Slot * s = *slots; for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos ) |