ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VS 2013 fixes

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-12-04 00:36:44 +00:00
parent 7c2e48e2c6
commit 68820bb325
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h
View File

@ -16,7 +16,7 @@ subject to the following restrictions:
#ifndef BT_COLLISION_OBJECT_H #ifndef BT_COLLISION_OBJECT_H
#define BT_COLLISION_OBJECT_H #define BT_COLLISION_OBJECT_H
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__) #if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__) && _MSC_VER < 1700
# undef isnan # undef isnan
# define isnan _isnan # define isnan _isnan
# define isinf(x) (!_finite(x)) # define isinf(x) (!_finite(x))

2
src/guiengine/widgets/rating_bar_widget.cpp
View File

@ -25,7 +25,7 @@
#include <IGUIButton.h> #include <IGUIButton.h>
#include <cmath> #include <cmath>
#ifdef WIN32 #if defined(WIN32) && _MSC_VER < 1700
// VS up to and including VS 2012 do not provide the normal round function // VS up to and including VS 2012 do not provide the normal round function
static inline float round(float val) static inline float round(float val)
{ {