[openoffice] branch trunk updated: Hmmm... not universal on all supported Darwins... punt for now

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 858958a  Hmmm... not universal on all supported Darwins... punt for now
858958a is described below

commit 858958ab355b52d97e776d0701d85304972f6508
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Sat Dec 5 14:26:24 2020 -0500

    Hmmm... not universal on all supported Darwins... punt for now
    
    (cherry picked from commit 675698291e11e0f0d4a3f63fd519393a6483f87a)
---
 main/bridges/source/cpp_uno/shared/vtablefactory.cxx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/main/bridges/source/cpp_uno/shared/vtablefactory.cxx b/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 4fe16e2..a8c0b3c 100644
--- a/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -96,15 +96,9 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
     sal_Size n = (*size + (pagesize - 1)) & ~(pagesize - 1);
     void * p;
 #if defined SAL_UNX
-#if defined MACOSX
-    p = mmap(
-        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;
     }