diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 3c8362178d..0b039e4886 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -4,11 +4,13 @@ #include "Emu/System.h" #include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/Modules.h" - #include "Emu/Cell/PPUDecoder.h" #include "Emu/Cell/PPUInterpreter.h" #include "Emu/Cell/PPUDisAsm.h" + #include +#include + extern gcmInfo gcm_info; PPUThread& GetCurrentPPUThread() @@ -190,7 +192,7 @@ bool FPRdouble::IsINF(PPCdouble d) bool FPRdouble::IsNaN(PPCdouble d) { - return isnan(d) ? 1 : 0; + return std::isnan((double)d) ? 1 : 0; } bool FPRdouble::IsQNaN(PPCdouble d) diff --git a/rpcs3/Emu/Memory/Memory.h b/rpcs3/Emu/Memory/Memory.h index 1642e36770..4a10a3260a 100644 --- a/rpcs3/Emu/Memory/Memory.h +++ b/rpcs3/Emu/Memory/Memory.h @@ -8,6 +8,15 @@ #include "Emu/SysCalls/Callback.h" #include +/* OS X uses MAP_ANON instead of MAP_ANONYMOUS */ +#ifndef MAP_ANONYMOUS + #ifdef MAP_ANON + #define MAP_ANONYMOUS MAP_ANON + #else + #define MAP_ANONYMOUS 0 + #endif +#endif + using std::nullptr_t; #define safe_delete(x) do {delete (x);(x)=nullptr;} while(0)