godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22783 from eska014/html5-warnings 

Fix warnings in HTML5 build outside platform files
This commit is contained in:
Rémi Verschelde 2018-10-06 12:51:58 +02:00 committed by GitHub
parent d2043fad67 5f45476dc1
commit 86d384e953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/math/math_funcs.h
View File

@ -46,7 +46,7 @@ class Math {
public: public:
Math() {} // useless to instance Math() {} // useless to instance
static const uint64_t RANDOM_MAX = 4294967295; static const uint64_t RANDOM_MAX = 0xFFFFFFFF;
static _ALWAYS_INLINE_ double sin(double p_x) { return ::sin(p_x); } static _ALWAYS_INLINE_ double sin(double p_x) { return ::sin(p_x); }
static _ALWAYS_INLINE_ float sin(float p_x) { return ::sinf(p_x); } static _ALWAYS_INLINE_ float sin(float p_x) { return ::sinf(p_x); }

4
drivers/unix/net_socket_posix.cpp
View File

@ -42,12 +42,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#ifndef NO_FCNTL #ifndef NO_FCNTL
#ifdef __HAIKU__
#include <fcntl.h> #include <fcntl.h>
#else #else
#include <sys/fcntl.h>
#endif
#else
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#include <netinet/in.h> #include <netinet/in.h>