<div dir="ltr">What is _VC_CRT_NAJOR_VERSION? Is it misprint or a hack? Google gives zero results.<div><br></div><div>-- Andrey Khalyavin</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 16, 2017 at 6:47 PM, Saleem Abdulrasool via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Thu Feb 16 09:47:50 2017<br>
New Revision: 295330<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=295330&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=295330&view=rev</a><br>
Log:<br>
math: correct the MSVCRT condition<br>
<br>
Fixes a number of tests in the testsuite on Windows.<br>
<br>
Modified:<br>
    libcxx/trunk/include/cmath<br>
    libcxx/trunk/include/math.h<br>
<br>
Modified: libcxx/trunk/include/cmath<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/cmath?rev=295330&r1=295329&r2=295330&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libcxx/trunk/include/<wbr>cmath?rev=295330&r1=295329&r2=<wbr>295330&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- libcxx/trunk/include/cmath (original)<br>
+++ libcxx/trunk/include/cmath Thu Feb 16 09:47:50 2017<br>
@@ -398,7 +398,7 @@ using ::cbrtf;<br>
 using ::copysign;<br>
 using ::copysignf;<br>
<br>
-#if !defined(_LIBCPP_MSVCRT) || ((_VC_CRT_NAJOR_VERSION-0) >= 14)<br>
+#if !(defined(_LIBCPP_MSVCRT) && ((_VC_CRT_NAJOR_VERSION-0) < 14))<br>
 using ::erf;<br>
 using ::erff;<br>
 using ::erfc;<br>
@@ -435,7 +435,7 @@ using ::lrint;<br>
 using ::lrintf;<br>
 using ::lround;<br>
 using ::lroundf;<br>
-#endif // _LIBCPP_MSVCRT<br>
+#endif // !(defined(_LIBCPP_MSVCRT) && ((_VC_CRT_NAJOR_VERSION-0) < 14))<br>
<br>
 using ::nan;<br>
 using ::nanf;<br>
<br>
Modified: libcxx/trunk/include/math.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/math.h?rev=295330&r1=295329&r2=295330&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libcxx/trunk/include/<wbr>math.h?rev=295330&r1=295329&<wbr>r2=295330&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- libcxx/trunk/include/math.h (original)<br>
+++ libcxx/trunk/include/math.h Thu Feb 16 09:47:50 2017<br>
@@ -1020,7 +1020,7 @@ copysign(_A1 __lcpp_x, _A2 __lcpp_y) _NO<br>
     return ::copysign((__result_type)__<wbr>lcpp_x, (__result_type)__lcpp_y);<br>
 }<br>
<br>
-#if !defined(_LIBCPP_MSVCRT) || ((_VC_CRT_MAJOR_VERSION-0) >= 14)<br>
+#if !(defined(_LIBCPP_MSVCRT) && ((_VC_CRT_NAJOR_VERSION-0) < 14))<br>
<br>
 // erf<br>
<br>
@@ -1404,7 +1404,7 @@ inline _LIBCPP_INLINE_VISIBILITY<br>
 typename std::enable_if<std::is_<wbr>integral<_A1>::value, double>::type<br>
 trunc(_A1 __lcpp_x) _NOEXCEPT {return ::trunc((double)__lcpp_x);}<br>
<br>
-#endif // !defined(_LIBCPP_MSVCRT) || ((_VC_CRT_MAJOR_VERSION-0) >= 14)<br>
+#endif // !(defined(_LIBCPP_MSVCRT) && ((_VC_CRT_NAJOR_VERSION-0) < 14))<br>
<br>
 } // extern "C++"<br>
<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>