diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-03 08:47:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-03 12:00:29 +0200 |
| commit | cbc34f69ec6363cd234ad2b1dfe09bfb531238db (patch) | |
| tree | da6dd9dd4ca1d84a4cf929ab9f459c960ea73f4f | |
| parent | 1c12e5fe5a458f4a4d4dd8080c2ade2f20ef17dc (diff) | |
Rename #define HAVE_LIBCXX -> HAVE_LIBCPP
...to harmonize it with the HAVE_LIBCPP configuration variable recently
introduced in 6014f363a08f2edd6086cf30b3bbb913f1c621c6 "improve support for
using libc++ on Linux and for libc++ debug mode"
Change-Id: I6b3fee2e4e564d75caf1e60095d0b554153bce9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133745
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | config_host/config_libcxx.h.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | unotools/source/i18n/resmgr.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config_host/config_libcxx.h.in b/config_host/config_libcxx.h.in index cd90bb821154..d1ae77a53210 100644 --- a/config_host/config_libcxx.h.in +++ b/config_host/config_libcxx.h.in @@ -10,7 +10,7 @@ #ifndef INCLUDED_CONFIG_HOST_CONFIG_LIBCXX_H #define INCLUDED_CONFIG_HOST_CONFIG_LIBCXX_H -#define HAVE_LIBCXX 0 +#define HAVE_LIBCPP 0 #endif diff --git a/configure.ac b/configure.ac index c4e71a8a12ff..776dbe918d94 100644 --- a/configure.ac +++ b/configure.ac @@ -7391,7 +7391,7 @@ foo bar ]])], [CPP_LIBRARY=LIBCPP cpp_library_name="LLVM libc++" - AC_DEFINE([HAVE_LIBCXX]) + AC_DEFINE([HAVE_LIBCPP]) HAVE_LIBCPP=TRUE ], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index fb6d32a45d6b..faa35ffe5c9e 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -23,7 +23,7 @@ // workdir/UnpackedTarball/boost/boost/locale/format.hpp using "std::auto_ptr<data> d;", but must // come very early here in case <memory> is already (indirectly) included earlier: #include <config_libcxx.h> -#if HAVE_LIBCXX +#if HAVE_LIBPP #define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR #elif defined _MSC_VER #define _HAS_AUTO_PTR_ETC 1 |