ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

newHostVM: Linux compilation fixes. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/newHostVM@3998 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-11-06 05:21:06 +00:00
parent 3bdf62fa0e
commit 7f51e8ee66
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/Utilities/Linux/LnxHostSys.cpp
View File

@ -91,7 +91,7 @@ bool HostSys::MmapCommitPtr(void* base, size_t size, const PageProtectionMode& m
// as PROT_NONE, then just ignore this call (memory will be committed automatically // as PROT_NONE, then just ignore this call (memory will be committed automatically
// later when the user changes permissions to something useful via calls to MemProtect). // later when the user changes permissions to something useful via calls to MemProtect).
if (mode.IsNone()) return; if (mode.IsNone()) return false;
if (_memprotect( base, size, mode )) return true; if (_memprotect( base, size, mode )) return true;
@ -153,7 +153,7 @@ void HostSys::MemProtect( void* baseaddr, size_t size, const PageProtectionMode&
{ {
if (!_memprotect(baseaddr, size, mode)) if (!_memprotect(baseaddr, size, mode))
{ {
throw Exception::OutOfMemory( "MemProtect" ) throw Exception::OutOfMemory( L"MemProtect" )
.SetDiagMsg(pxsFmt( L"mprotect failed @ 0x%08X -> 0x%08X (mode=%s)", .SetDiagMsg(pxsFmt( L"mprotect failed @ 0x%08X -> 0x%08X (mode=%s)",
baseaddr, (uptr)baseaddr+size, mode.ToString().c_str() baseaddr, (uptr)baseaddr+size, mode.ToString().c_str()
) )

6
common/src/Utilities/VirtualMemory.cpp
View File

@ -17,7 +17,11 @@
#include "PageFaultSource.h" #include "PageFaultSource.h"
#include "EventSource.inl" #include "EventSource.inl"
#include "MemsetFast.inl" #include "MemsetFast.inl"
#ifndef __WXMSW__
#include <wx/thread.h>
#endif
template class EventSource< IEventListener_PageFault >; template class EventSource< IEventListener_PageFault >;