diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-18 15:48:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 15:48:39 +0100 |
| commit | ca14dd296a9ce9f39cefe378fda5e127375970f4 (patch) | |
| tree | 7acf9382de6fdb12c3687af43973fe0936057d92 | |
| parent | 430b008b0d1e39d9190c153e86c800b023a58963 (diff) | |
| parent | d11a4c11203049584fd5d3d34f3554e5c9289d01 (diff) | |
Merge pull request #7572 from BastiaanOlij/fix_math
Some changes in the header so Godot3 compiles again on Windows.
| -rw-r--r-- | core/math/math_funcs.cpp | 4 | ||||
| -rw-r--r-- | 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 ef8c1ec539..70b1f303a5 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 e81646b1ca..665182afcf 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 <math.h> -#endif - +#include <float.h> + #define Math_PI 3.14159265358979323846 #define Math_SQRT12 0.7071067811865475244008443621048490 |