summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/SDL2/src/stdlib/SDL_stdlib.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-11-16 16:26:13 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-11-16 16:28:01 +0100
commit47a05778bff9388fc6c479461dd3804c79d7b539 (patch)
treebb3d4dc8df676b8aa478339b3fd0cd305dc4ac4d /3rdparty/SDL2/src/stdlib/SDL_stdlib.c
parente61b392edfbfe5b9d70908c087632da915a3abd8 (diff)
Updated SDL2 to 2.0.5 (nw)
Diffstat (limited to '3rdparty/SDL2/src/stdlib/SDL_stdlib.c')
-rw-r--r--3rdparty/SDL2/src/stdlib/SDL_stdlib.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/3rdparty/SDL2/src/stdlib/SDL_stdlib.c b/3rdparty/SDL2/src/stdlib/SDL_stdlib.c
index 6723d4e2c80..f5a152b49fc 100644
--- a/3rdparty/SDL2/src/stdlib/SDL_stdlib.c
+++ b/3rdparty/SDL2/src/stdlib/SDL_stdlib.c
@@ -34,7 +34,7 @@
double
SDL_atan(double x)
{
-#ifdef HAVE_ATAN
+#if defined(HAVE_ATAN)
return atan(x);
#else
return SDL_uclibc_atan(x);
@@ -90,7 +90,7 @@ SDL_asin(double val)
double
SDL_ceil(double x)
{
-#ifdef HAVE_CEIL
+#if defined(HAVE_CEIL)
return ceil(x);
#else
double integer = SDL_floor(x);
@@ -127,7 +127,7 @@ SDL_cos(double x)
float
SDL_cosf(float x)
{
-#ifdef HAVE_COSF
+#if defined(HAVE_COSF)
return cosf(x);
#else
return (float)SDL_cos((double)x);
@@ -199,7 +199,7 @@ SDL_sin(double x)
float
SDL_sinf(float x)
{
-#ifdef HAVE_SINF
+#if defined(HAVE_SINF)
return sinf(x);
#else
return (float)SDL_sin((double)x);
@@ -248,14 +248,14 @@ SDL_tanf(float x)
int SDL_abs(int x)
{
-#ifdef HAVE_ABS
+#if defined(HAVE_ABS)
return abs(x);
#else
return ((x) < 0 ? -(x) : (x));
#endif
}
-#ifdef HAVE_CTYPE_H
+#if defined(HAVE_CTYPE_H)
int SDL_isdigit(int x) { return isdigit(x); }
int SDL_isspace(int x) { return isspace(x); }
int SDL_toupper(int x) { return toupper(x); }
@@ -279,7 +279,7 @@ __declspec(selectany) int _fltused = 1;
#endif
/* The optimizer on Visual Studio 2005 and later generates memcpy() calls */
-#if (_MSC_VER >= 1400) && defined(_WIN64) && !defined(_DEBUG)
+#if (_MSC_VER >= 1400) && defined(_WIN64) && !defined(_DEBUG) && !(_MSC_VER >= 1900 && defined(_MT))
#include <intrin.h>
#pragma function(memcpy)