diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2013-09-25 20:01:44 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2013-09-25 20:01:44 +0000 |
| commit | 0e99d99f779b2cf1fa035f96c0a34013ffa9dc88 (patch) | |
| tree | 6166ff46df3cc587a363911f83d7245a9104042c /libcxx/src | |
| parent | 46a72bb3bf64532088441dfdd78799fad21b9d41 (diff) | |
| download | bcm5719-llvm-0e99d99f779b2cf1fa035f96c0a34013ffa9dc88.tar.gz bcm5719-llvm-0e99d99f779b2cf1fa035f96c0a34013ffa9dc88.zip | |
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.
llvm-svn: 191397
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/typeinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/typeinfo.cpp b/libcxx/src/typeinfo.cpp index 60828944a1b..3bb6fda9ee7 100644 --- a/libcxx/src/typeinfo.cpp +++ b/libcxx/src/typeinfo.cpp @@ -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__ |
