[Scummvm-cvs-logs] scummvm master -> 4790a4abd5c157254cab069bc34aa8ef8347f668

lordhoto lordhoto at gmail.com
Fri Aug 2 20:07:35 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4790a4abd5 COMMON: Define all Unix98/BSD math constants in scummsys.h.


Commit: 4790a4abd5c157254cab069bc34aa8ef8347f668
    https://github.com/scummvm/scummvm/commit/4790a4abd5c157254cab069bc34aa8ef8347f668
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-08-02T11:02:02-07:00

Commit Message:
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.

Changed paths:
    common/scummsys.h



diff --git a/common/scummsys.h b/common/scummsys.h
index 099b12b..3e9d5ef 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.






More information about the Scummvm-git-logs mailing list