Module: Mesa
Branch: master
Commit: fdb507e3d6a9a78f8a42bc8d6f7e60816627403e
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fdb507e3d6a9a78f8a42bc8d6f7e60816627403e

Author: Jose Fonseca <[email protected]>
Date:   Tue Mar 24 13:16:24 2015 +0000

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 <[email protected]>

---

 include/c99_math.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/c99_math.h b/include/c99_math.h
index 5b01d53..ee0dd10 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)
 {

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to