From d11a4c11203049584fd5d3d34f3554e5c9289d01 Mon Sep 17 00:00:00 2001 From: BastiaanOlij Date: Wed, 18 Jan 2017 21:55:47 +1100 Subject: [PATCH] Some changes in the header so Godot3 compiles again on Windows. --- core/math/math_funcs.cpp | 4 ---- core/math/math_funcs.h | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp index ef8c1ec539e7..70b1f303a5b9 100644 --- a/core/math/math_funcs.cpp +++ b/core/math/math_funcs.cpp @@ -27,12 +27,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "math_funcs.h" - #include "core/os/os.h" -#include "float.h" -#include "pcg.h" - pcg32_random_t Math::default_pcg = {1, PCG_DEFAULT_INC_64}; #define PHI 0x9e3779b9 diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index e81646b1cab0..665182afcf54 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -33,10 +33,9 @@ #include "math_defs.h" #include "pcg.h" -#ifndef NO_MATH_H #include -#endif - +#include + #define Math_PI 3.14159265358979323846 #define Math_SQRT12 0.7071067811865475244008443621048490