[openoffice] branch AOO42X updated: Be consistent... 0 and not NULL

[jim]

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 926363d  Be consistent... 0 and not NULL
926363d is described below

commit 926363d2b6bcceac963c67c0820c2460abc578b3
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Thu Jan 14 14:51:01 2021 -0500

    Be consistent... 0 and not NULL
    
    (cherry picked from commit cc84755763d148a3d068f28c76dd3de36e9971f3)
---
 main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx 
b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
index 723ce94..d26186b 100644
--- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
+++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
@@ -313,7 +313,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * 
pUnoExc, uno_Mapping
     {
         // Does this look like the newer struct __cxa_exception?
         // That is, is the 1st element NULL (*reserved)?
-        if (*reinterpret_cast<void **>(header) == NULL) {
+        if (*reinterpret_cast<void **>(header) == 0) {
             // Yes. So we move up a slot to offset
             header = reinterpret_cast<__cxa_exception *>(reinterpret_cast<void 
**>(header) + 1);
         }