summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJose Fonseca <[email protected]>2015-03-24 13:16:24 +0000
committerJose Fonseca <[email protected]>2015-03-25 10:42:41 +0000
commitfdb507e3d6a9a78f8a42bc8d6f7e60816627403e (patch)
tree3342a8a561af4b94a8a813d36133ec1a08714e6b /include
parent69db422218b0264b5b8eef45bd003a2544e9cbd6 (diff)
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]>
Diffstat (limited to 'include')
-rw-r--r--include/c99_math.h3
1 files changed, 2 insertions, 1 deletions
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)
{