Merge remote-tracking branch 'refs/remotes/xmrig/master'

Conflicts:
	CHANGELOG.md
	src/Options.h
	src/Platform_unix.cpp
	src/log/ConsoleLog.cpp
	src/version.h

src/api/ApiState.cpp

@@ -21,7 +21,7 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cmath>
+#include <math.h>
 #include <string.h>
 #include <uv.h>
 
@@ -53,11 +53,11 @@ extern "C"
 
 static inline double normalize(double d)
 {
-    if (!std::isnormal(d)) {
+    if (!isnormal(d)) {
         return 0.0;
     }
 
-    return std::floor(d * 100.0) / 100.0;
+    return floor(d * 100.0) / 100.0;
 }
 
 

src/api/NetworkState.cpp

@@ -23,6 +23,7 @@
 
 
 #include <algorithm>
+#include <stdio.h>
 #include <string.h>
 #include <uv.h>