diff options
author | Johannes Schickel | 2013-08-02 20:02:02 +0200 |
---|---|---|
committer | Johannes Schickel | 2013-08-02 20:02:02 +0200 |
commit | 4790a4abd5c157254cab069bc34aa8ef8347f668 (patch) | |
tree | 431ea1150497bc285d4059365afb4685d6798341 | |
parent | ff451ba2dc8c417d781f362f4af80aec44b57341 (diff) | |
download | scummvm-rg350-4790a4abd5c157254cab069bc34aa8ef8347f668.tar.gz scummvm-rg350-4790a4abd5c157254cab069bc34aa8ef8347f668.tar.bz2 scummvm-rg350-4790a4abd5c157254cab069bc34aa8ef8347f668.zip |
COMMON: Define all Unix98/BSD math constants in scummsys.h.
This should fix compilation on mingw64 with --enable-c++11 and also make sure
the constants are present on other systems for the uncommon case they might be
missing.
-rw-r--r-- | common/scummsys.h | 50 |
1 files changed, 47 insertions, 3 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 099b12b291..3e9d5ef063 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -149,12 +149,56 @@ // present i.e. when -std=c++11 is passed to GCC, enabling strict ANSI compliance. // As we rely on these being present, we define them if they are not set. -#ifndef M_SQRT1_2 - #define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ +#ifndef M_E + #define M_E 2.7182818284590452354 /* e */ +#endif + +#ifndef M_LOG2E + #define M_LOG2E 1.4426950408889634074 /* log_2 e */ +#endif + +#ifndef M_LOG10E + #define M_LOG10E 0.43429448190325182765 /* log_10 e */ +#endif + +#ifndef M_LN2 + #define M_LN2 0.69314718055994530942 /* log_e 2 */ +#endif + +#ifndef M_LN10 + #define M_LN10 2.30258509299404568402 /* log_e 10 */ #endif #ifndef M_PI - #define M_PI 3.14159265358979323846 + #define M_PI 3.14159265358979323846 /* pi */ +#endif + +#ifndef M_PI_2 + #define M_PI_2 1.57079632679489661923 /* pi/2 */ +#endif + +#ifndef M_PI_4 + #define M_PI_4 0.78539816339744830962 /* pi/4 */ +#endif + +#ifndef M_1_PI + #define M_1_PI 0.31830988618379067154 /* 1/pi */ +#endif + +#ifndef M_2_PI + #define M_2_PI 0.63661977236758134308 /* 2/pi */ +#endif + +#ifndef M_2_SQRTPI + #define M_2_SQRTPI 1.12837916709551257390 /* 2/sqrt(pi) */ +#endif + +#ifndef M_SQRT2 + #define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ +#endif + +#ifndef M_SQRT1_2 + #define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ #endif // Include our C++11 compatability header for pre-C++11 compilers. |