Skip to content

Commit 08a61eb

Browse files
authored
[libcxxabi/demangle] Remove __cxxabi_config.h include (#101971)
The demangler is shared between libcxxabi and llvm/lib/Demangle, see libcxxabi/src/demangle/README.txt. The copy in llvm/lib/Demangle cannot use __cxxabi_config.h. Remove the include. It was only used to identify clang, which can easily be done without the include as well. No intended behavior change.
1 parent 248c534 commit 08a61eb

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

libcxxabi/src/demangle/ItaniumDemangle.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "DemangleConfig.h"
2020
#include "StringViewExtras.h"
2121
#include "Utility.h"
22-
#include <__cxxabi_config.h>
2322
#include <algorithm>
2423
#include <cctype>
2524
#include <cstdio>
@@ -31,7 +30,7 @@
3130
#include <type_traits>
3231
#include <utility>
3332

34-
#ifdef _LIBCXXABI_COMPILER_CLANG
33+
#if defined(__clang__)
3534
#pragma clang diagnostic push
3635
#pragma clang diagnostic ignored "-Wunused-template"
3736
#endif
@@ -5948,7 +5947,7 @@ struct ManglingParser : AbstractManglingParser<ManglingParser<Alloc>, Alloc> {
59485947

59495948
DEMANGLE_NAMESPACE_END
59505949

5951-
#ifdef _LIBCXXABI_COMPILER_CLANG
5950+
#if defined(__clang__)
59525951
#pragma clang diagnostic pop
59535952
#endif
59545953

0 commit comments

Comments
 (0)