From 85bfec00a066b91097d286e5e6e0d40daa47597a Mon Sep 17 00:00:00 2001 From: auria Date: Wed, 4 Dec 2013 01:54:54 +0000 Subject: [PATCH] Correct VS compilation (VS 2013 is 18, not 17) git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14629 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- .../src/BulletCollision/CollisionDispatch/btCollisionObject.h | 2 +- src/guiengine/widgets/rating_bar_widget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h index 38febe379..6140458e4 100644 --- a/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h +++ b/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef BT_COLLISION_OBJECT_H #define BT_COLLISION_OBJECT_H -#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__) && _MSC_VER < 1700 +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__) && _MSC_VER < 1800 # undef isnan # define isnan _isnan # define isinf(x) (!_finite(x)) diff --git a/src/guiengine/widgets/rating_bar_widget.cpp b/src/guiengine/widgets/rating_bar_widget.cpp index 0551a7a1f..3444aed98 100644 --- a/src/guiengine/widgets/rating_bar_widget.cpp +++ b/src/guiengine/widgets/rating_bar_widget.cpp @@ -25,7 +25,7 @@ #include #include -#if defined(WIN32) && _MSC_VER < 1700 +#if defined(WIN32) && _MSC_VER < 1800 // VS up to and including VS 2012 do not provide the normal round function static inline float round(float val) {