[cfe-commits] [libcxx] r163120 - in /libcxx/trunk: include/__undef_min_max src/stdexcept.cpp

[Howard Hinnant]

Author: hhinnant
Date: Mon Sep  3 13:13:11 2012
New Revision: 163120

URL: http://llvm.org/viewvc/llvm-project?rev=163120&view=rev
Log:
Some minor mingw64 porting tweaks from Glen.

Modified:
    libcxx/trunk/include/__undef_min_max
    libcxx/trunk/src/stdexcept.cpp

Modified: libcxx/trunk/include/__undef_min_max
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__undef_min_max?rev=163120&r1=163119&r2=163120&view=diff
==============================================================================
--- libcxx/trunk/include/__undef_min_max (original)
+++ libcxx/trunk/include/__undef_min_max Mon Sep  3 13:13:11 2012
@@ -9,11 +9,11 @@
 //===----------------------------------------------------------------------===//
 
 #ifdef min
-#warning: macro min is incompatible with C++.  #undef'ing min
+#warning: macro min is incompatible with C++.  #undefing min
 #undef min
 #endif
 
 #ifdef max
-#warning: macro max is incompatible with C++.  #undef'ing max
+#warning: macro max is incompatible with C++.  #undefing max
 #undef max
 #endif

Modified: libcxx/trunk/src/stdexcept.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/stdexcept.cpp?rev=163120&r1=163119&r2=163120&view=diff
==============================================================================
--- libcxx/trunk/src/stdexcept.cpp (original)
+++ libcxx/trunk/src/stdexcept.cpp Mon Sep  3 13:13:11 2012
@@ -16,8 +16,13 @@
 #include <cstddef>
 #include "system_error"
 
-// Use <cxxabi.h> to determine whether we're linking against libc++abi.
-#if __has_include(<cxxabi.h>)
+#ifndef __has_include
+#define __has_include(inc) 0
+#endif
+
+#if __APPLE__
+#include <cxxabi.h>
+#elif defined(LIBCXXRT) || __has_include(<cxxabi.h>)
 #include <cxxabi.h>
 #endif