From 97d736d27435fb26d5609000f77bd79ece08572e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 18 Dec 2019 10:59:46 +0100 Subject: Fix typos concerning the __cxa_exception check ...introduced with 069506bcb0ee4005b01c22095ed427b96b553c98 "Use config_cxxabi.h to check for __cxa_eh_globals, __cxa_exception", but which appear to have been harmless as (a) the checked-for __cxxabiv1::__cxa_exceptions never existed in cxxabi.h, and (b) lack of __cxxabiv1::__cxa_exception in cxxabi.h happened to conincide with !HAVE_CXXABI_H_CXA_EH_GLOBALS Change-Id: I13f8a2b3cf0f03f2bc96cf053d2b571860055978 Reviewed-on: https://gerrit.libreoffice.org/85373 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 2 +- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bridges') diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx index ac380969e21b..0faa612d92fd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx @@ -60,7 +60,7 @@ public: } #endif -#if !HAVE_CXXABI_H_CXA_EH_GLOBALS +#if !HAVE_CXXABI_H_CXA_EXCEPTION namespace __cxxabiv1 { struct __cxa_exception { diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx index 864173470476..e8afe35c4f59 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @@ -101,7 +101,7 @@ public: } #endif -#if !HAVE_CXXABI_H_CXA_EH_GLOBALS +#if !HAVE_CXXABI_H_CXA_EXCEPTION // , // libcxxabi/src/cxa_exception.hpp: namespace __cxxabiv1 { -- cgit