You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2020/12/02 14:07:49 UTC
[openoffice] branch AOO42X updated: DOUBLE_MAP on macOS is
probelmatic on later systems. Punt for now.
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new c757d8c DOUBLE_MAP on macOS is probelmatic on later systems. Punt for now.
c757d8c is described below
commit c757d8c627d70ac92c9a1decf4153cfe497b40c6
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Wed Dec 2 09:06:38 2020 -0500
DOUBLE_MAP on macOS is probelmatic on later systems. Punt for now.
---
main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 2 +-
main/bridges/source/cpp_uno/shared/vtablefactory.cxx | 4 ++--
main/vcl/aqua/source/app/salinst.cxx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index dc15fb5..3fe88e5 100644
--- a/main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -33,7 +33,7 @@
#include <hash_map>
/*See: http://people.redhat.com/drepper/selinux-mem.html*/
-#if defined (LINUX) || defined (FREEBSD) || defined(MACOSX)
+#if defined (LINUX) || defined (FREEBSD)
#define USE_DOUBLE_MMAP
#endif
diff --git a/main/bridges/source/cpp_uno/shared/vtablefactory.cxx b/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 35bad98..4fe16e2 100644
--- a/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -98,12 +98,13 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
#if defined SAL_UNX
#if defined MACOSX
p = mmap(
- 0, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON | MAP_JIT, -1,
+ 0, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, -1,
0);
#else
p = mmap(
0, n, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1,
0);
+#endif
if (p == MAP_FAILED) {
p = 0;
}
@@ -112,7 +113,6 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
munmap (static_cast<char*>(p), n);
p = 0;
}
-#endif
#elif defined SAL_W32
p = VirtualAlloc(0, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
#elif defined(SAL_OS2)
diff --git a/main/vcl/aqua/source/app/salinst.cxx b/main/vcl/aqua/source/app/salinst.cxx
index 8ba2d56..4d27a87 100644
--- a/main/vcl/aqua/source/app/salinst.cxx
+++ b/main/vcl/aqua/source/app/salinst.cxx
@@ -781,7 +781,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
}
osl_setCondition( maWaitingYieldCond );
}
- else if( bWait && maWaitingYieldCond )
+ else if( bWait )
{
// #i103162#
// wait until any thread (most likely the main thread)