[openoffice] branch AOO419 updated: Force SDK 10.11 at most Pass NULL, not -1 (!!)

[jim]

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

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


The following commit(s) were added to refs/heads/AOO419 by this push:
     new 3a8d6f3  Force SDK 10.11 at most Pass NULL, not -1 (!!)
3a8d6f3 is described below

commit 3a8d6f3043497c977d0d75bdb2b5232be6c8deef
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Sat Dec 26 14:39:46 2020 -0500

    Force SDK 10.11 at most
    Pass NULL, not -1 (!!)
---
 main/bridges/source/cpp_uno/shared/vtablefactory.cxx | 2 +-
 main/configure.ac                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
index f4d6c56..2ca9b8f 100644
--- a/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -195,7 +195,7 @@ VtableFactory::VtableFactory(): m_arena(
     rtl_arena_create(
         "bridges::cpp_uno::shared::VtableFactory",
         sizeof (void *), // to satisfy alignment requirements
-        0, reinterpret_cast< rtl_arena_type * >(-1), allocExec, freeExec, 0))
+        0, reinterpret_cast< rtl_arena_type * >(0), allocExec, freeExec, 0))
 {
     if (m_arena == 0) {
         throw std::bad_alloc();
diff --git a/main/configure.ac b/main/configure.ac
index 83962b3..8051e40 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -3935,7 +3935,7 @@ if test  "$_os" = "Darwin"; then
    else
       MACOSX_DEPLOYMENT_TARGET=$sdk_target
 
-      sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11|12)" 
| sed -e "s/.*sdk //" | tail -n1`
+      sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11)" | 
sed -e "s/.*sdk //" | tail -n1`
       if test -z "$sdk_found"; then
          AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
       else