Make the guard for external ABI libraries include the guard for
libsupc++ in typeinfo.cpp, bringing it into agreement with exception.cpp. This fixes link errors due to duplicate symbols from this translation unit. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@191397 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
fc910cb9a0
commit
d1754fb3e9
@ -20,7 +20,7 @@
|
||||
|
||||
#include "typeinfo"
|
||||
|
||||
#if !(defined(_LIBCPPABI_VERSION) || defined(LIBCXXRT))
|
||||
#if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__)
|
||||
|
||||
std::bad_cast::bad_cast() _NOEXCEPT
|
||||
{
|
||||
@ -67,4 +67,4 @@ std::bad_typeid::what() const _NOEXCEPT
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // _LIBCPPABI_VERSION
|
||||
#endif // !LIBCXXRT && !_LIBCPPABI_VERSION && !__GLIBCXX__
|
||||
|
Loading…
x
Reference in New Issue
Block a user