From: Jose Fonseca <jfonseca@vmware.com>
Date: Tue, 24 Mar 2015 13:16:24 +0000 (+0000)
Subject: c99_math: Don't reimplement lrint and friends on MSVC 2013.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fdb507e3d6a9a78f8a42bc8d6f7e60816627403e;p=mesa.git

c99_math: Don't reimplement lrint and friends on MSVC 2013.

MSVC 2013 declares these functions, both for C and C++ source files.

This was caught with MSVC in analyze mode.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/include/c99_math.h b/include/c99_math.h
index 5b01d53a83a..ee0dd105e49 100644
--- a/include/c99_math.h
+++ b/include/c99_math.h
@@ -82,7 +82,8 @@ roundf(float x)
 #endif /* _MSC_VER */
 
 
-#if __STDC_VERSION__ < 199901L && (!defined(__cplusplus) || defined(_MSC_VER))
+#if (defined(_MSC_VER) && _MSC_VER < 1800) || \
+    (!defined(_MSC_VER) && __STDC_VERSION__ < 199901L && !defined(__cplusplus))
 static inline long int
 lrint(double d)
 {