strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename #define HAVE_LIBCXX -> HAVE_LIBCPP

Browse source 
...to harmonize it with the HAVE_LIBCPP configuration variable recently
introduced in 6014f363a0 "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>
This commit is contained in:
Stephan Bergmann 2022-05-03 08:47:44 +02:00
parent 1c12e5fe5a
commit cbc34f69ec
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config_host/config_libcxx.h.in
View file

@ -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

2
configure.ac
View file

@ -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([[

2
unotools/source/i18n/resmgr.cxx
View file

@ -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