diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-06 12:51:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 12:51:58 +0200 |
| commit | 86d384e95343f51a5ea724fd040173311fb337d3 (patch) | |
| tree | a9d79951997e7b061239e289f18473734e13c734 | |
| parent | d2043fad67b000188d2cdea9ac1ca6abe9f92ab7 (diff) | |
| parent | 5f45476dc1b785ef5412e2d2f973c3caa764c0a8 (diff) | |
Merge pull request #22783 from eska014/html5-warnings
Fix warnings in HTML5 build outside platform files
| -rw-r--r-- | core/math/math_funcs.h | 2 | ||||
| -rw-r--r-- | drivers/unix/net_socket_posix.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index 472baf0484..9a486a49d0 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -46,7 +46,7 @@ class Math { public: 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_ float sin(float p_x) { return ::sinf(p_x); } diff --git a/drivers/unix/net_socket_posix.cpp b/drivers/unix/net_socket_posix.cpp index 3f03175403..2cc2032cbb 100644 --- a/drivers/unix/net_socket_posix.cpp +++ b/drivers/unix/net_socket_posix.cpp @@ -42,12 +42,8 @@ #include <sys/types.h> #include <unistd.h> #ifndef NO_FCNTL -#ifdef __HAIKU__ #include <fcntl.h> #else -#include <sys/fcntl.h> -#endif -#else #include <sys/ioctl.h> #endif #include <netinet/in.h> |