Skip to content

Commit c647a1e

Browse files
update headers and modules
1 parent c70bfc7 commit c647a1e

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

libcxx/include/module.modulemap.in

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,10 +1336,7 @@ module std [system] {
13361336
module concepts { header "__format/concepts.h" }
13371337
module container_adaptor { header "__format/container_adaptor.h" }
13381338
module enable_insertable { header "__format/enable_insertable.h" }
1339-
module escaped_output_table {
1340-
header "__format/escaped_output_table.h"
1341-
export std.format.escaped_output_table // TODO: Workaround for https://github.com/llvm/llvm-project/issues/120108
1342-
}
1339+
module escaped_output_table { header "__format/escaped_output_table.h" }
13431340
module extended_grapheme_cluster_table { header "__format/extended_grapheme_cluster_table.h" }
13441341
module fmt_pair_like { header "__format/fmt_pair_like.h" }
13451342
module format_arg { header "__format/format_arg.h" }
@@ -1376,10 +1373,7 @@ module std [system] {
13761373
module range_format { header "__format/range_format.h" }
13771374
module range_formatter { header "__format/range_formatter.h" }
13781375
module unicode { header "__format/unicode.h" }
1379-
module width_estimation_table {
1380-
header "__format/width_estimation_table.h"
1381-
export std.format.width_estimation_table // TODO: Workaround for https://github.com/llvm/llvm-project/issues/120108
1382-
}
1376+
module width_estimation_table { header "__format/width_estimation_table.h" }
13831377
module write_escaped { header "__format/write_escaped.h" }
13841378

13851379
header "format"

libcxx/src/stacktrace/linux/impl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ struct linux {
3434
} // namespace __stacktrace
3535
_LIBCPP_END_NAMESPACE_STD
3636

37-
#include "stacktrace/config.h"
37+
#include <__config>
38+
#include <__config_site>
3839

3940
#if defined(__linux__)
4041

libcxx/src/stacktrace/macos/impl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#include <cstddef>
1515
#include <cstdlib>
1616

17-
#include "stacktrace/config.h"
17+
#include <__config>
18+
#include <__config_site>
1819
#include <__stacktrace/base.h>
1920

2021
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/src/stacktrace/tools/tools.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "stacktrace/config.h"
9+
#include <__config>
10+
#include <__config_site>
1011

11-
#if defined(_LIBCPP_STACKTRACE_CAN_SPAWN_TOOLS)
12+
#if __has_include(<spawn.h>) && _LIBCPP_STACKTRACE_ALLOW_TOOLS_AT_RUNTIME
1213

13-
# include <__config>
14-
# include <__config_site>
1514
# include <cassert>
1615
# include <cerrno>
1716
# include <csignal>

libcxx/src/stacktrace/unwind/impl.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "stacktrace/config.h"
9+
#include <__config>
10+
#include <__config_site>
1011

11-
#if defined(_LIBCPP_STACKTRACE_UNWIND_IMPL)
12+
#if __has_include(<unwind.h>)
1213

1314
# include <unwind.h>
1415

0 commit comments

Comments
 (0)