[libcxx] r191397 - Make the guard for external ABI libraries include the guard for

[Chandler Carruth]

Author: chandlerc
Date: Wed Sep 25 15:01:44 2013
New Revision: 191397

URL: http://llvm.org/viewvc/llvm-project?rev=191397&view=rev
Log:
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.

Modified:
    libcxx/trunk/src/typeinfo.cpp

Modified: libcxx/trunk/src/typeinfo.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/typeinfo.cpp?rev=191397&r1=191396&r2=191397&view=diff
==============================================================================
--- libcxx/trunk/src/typeinfo.cpp (original)
+++ libcxx/trunk/src/typeinfo.cpp Wed Sep 25 15:01:44 2013
@@ -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__