From 7f51e8ee662fd6453b916707d1935c17e41523eb Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 6 Nov 2010 05:21:06 +0000
Subject: [PATCH] newHostVM: Linux compilation fixes.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/newHostVM@3998 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 common/src/Utilities/Linux/LnxHostSys.cpp | 4 ++--
 common/src/Utilities/VirtualMemory.cpp    | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/src/Utilities/Linux/LnxHostSys.cpp b/common/src/Utilities/Linux/LnxHostSys.cpp
index 5c224431f4..7cff02002b 100644
--- a/common/src/Utilities/Linux/LnxHostSys.cpp
+++ b/common/src/Utilities/Linux/LnxHostSys.cpp
@@ -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
 	// 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;
 
@@ -153,7 +153,7 @@ void HostSys::MemProtect( void* baseaddr, size_t size, const PageProtectionMode&
 {
 	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)",
 				baseaddr, (uptr)baseaddr+size, mode.ToString().c_str()
 			)
diff --git a/common/src/Utilities/VirtualMemory.cpp b/common/src/Utilities/VirtualMemory.cpp
index bf0e532d5c..fa4e96a399 100644
--- a/common/src/Utilities/VirtualMemory.cpp
+++ b/common/src/Utilities/VirtualMemory.cpp
@@ -17,7 +17,11 @@
 
 #include "PageFaultSource.h"
 #include "EventSource.inl"
-#include "MemsetFast.inl"
+#include "MemsetFast.inl"
+
+#ifndef __WXMSW__
+#include <wx/thread.h>
+#endif
 
 template class EventSource< IEventListener_PageFault >;