[libcxx-commits] [libcxx] [libcxx] don't `#include <cwchar>` if wide chars aren't enabled (PR #99911)
Ties Stuij via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Jul 22 11:09:36 PDT 2024
https://github.com/stuij created https://github.com/llvm/llvm-project/pull/99911
Pull request #96032 unconditionall adds the `cwchar` include in the `format` umbrella header. However support for wchar_t can be disabled in the build system (LIBCXX_ENABLE_WIDE_CHARACTERS).
This patch guards against inclusion of `cwchar` in `format` by checking the `_LIBCPP_HAS_NO_WIDE_CHARACTERS` define.
>From b39ab98b04612142bee87235616b211be1d9145b Mon Sep 17 00:00:00 2001
From: Ties Stuij <ties.stuij at arm.com>
Date: Mon, 22 Jul 2024 18:26:55 +0100
Subject: [PATCH] [libcxx] don't `#include <cwchar>` if wide chars aren't
enabled
Pull request #96032 unconditionall adds the `cwchar` include in the `format`
umbrella header. However support for wchar_t can be disabled in the build
system (LIBCXX_ENABLE_WIDE_CHARACTERS).
This patch guards against inclusion of `cwchar` in `format` by checking the
`_LIBCPP_HAS_NO_WIDE_CHARACTERS` define.
---
libcxx/include/format | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libcxx/include/format b/libcxx/include/format
index c3f2b45f0f730..af5391ccea9dc 100644
--- a/libcxx/include/format
+++ b/libcxx/include/format
@@ -237,21 +237,21 @@ namespace std {
# include <cstdint>
# include <cstdlib>
# include <cstring>
-# include <cwchar>
# include <initializer_list>
# include <limits>
+# include <locale>
# include <new>
# include <optional>
+# include <queue>
+# include <stack>
# include <stdexcept>
# include <string>
# include <string_view>
# include <tuple>
-#endif
-#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
-# include <locale>
-# include <queue>
-# include <stack>
+#if !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
+# include <cwchar>
+#endif
#endif
#endif // _LIBCPP_FORMAT
More information about the libcxx-commits
mailing list