diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-03-20 11:40:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-05-14 11:43:05 +0000 |
| commit | 349cc55c9796c4596a5b9904cd3281af295f878f (patch) | |
| tree | 410c5a785075730a35f1272ca6a7adf72222ad03 /contrib/llvm-project/libcxx/include/clocale | |
| parent | cb2ae6163174b90e999326ecec3699ee093a5d43 (diff) | |
| parent | c0981da47d5696fe36474fcf86b4ce03ae3ff818 (diff) | |
Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-10186-gff7f2cfa959b.
PR: 261742
MFC after: 2 weeks
Diffstat (limited to 'contrib/llvm-project/libcxx/include/clocale')
| -rw-r--r-- | contrib/llvm-project/libcxx/include/clocale | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/llvm-project/libcxx/include/clocale b/contrib/llvm-project/libcxx/include/clocale index 8fe91fc5a3a4..ed8c7d240633 100644 --- a/contrib/llvm-project/libcxx/include/clocale +++ b/contrib/llvm-project/libcxx/include/clocale @@ -1,5 +1,5 @@ // -*- C++ -*- -//===--------------------------- clocale ----------------------------------===// +//===----------------------------------------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -44,9 +44,7 @@ lconv* localeconv(); _LIBCPP_BEGIN_NAMESPACE_STD using ::lconv _LIBCPP_USING_IF_EXISTS; -#ifndef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS using ::setlocale _LIBCPP_USING_IF_EXISTS; -#endif using ::localeconv _LIBCPP_USING_IF_EXISTS; _LIBCPP_END_NAMESPACE_STD |