[Scummvm-git-logs] scummvm master -> 6bea770e6dea89e6e19d418f9ee07148d3189bc8

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6bea770e6d COMMON: Fix PS2 build


Commit: 6bea770e6dea89e6e19d418f9ee07148d3189bc8
    https://github.com/scummvm/scummvm/commit/6bea770e6dea89e6e19d418f9ee07148d3189bc8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-06T00:09:35+02:00

Commit Message:
COMMON: Fix PS2 build

Changed paths:
    common/json.h


diff --git a/common/json.h b/common/json.h
index c1e630ca32..7b7c6b8d58 100644
--- a/common/json.h
+++ b/common/json.h
@@ -53,7 +53,7 @@
 #include "common/str.h"
 
 // Win32 incompatibilities
-#if defined(WIN32) && !defined(__GNUC__)
+#if (defined(WIN32) && !defined(__GNUC__)) || defined(__PLAYSTATION2__)
 static inline bool isnan(double x) {
 	return x != x;
 }