From 136300ab2ed7dc19b311f63b32ea7dd0f7dd0c6d Mon Sep 17 00:00:00 2001
From: "gregory.hainaut" <gregory.hainaut@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Fri, 12 Aug 2011 18:25:21 +0000
Subject: [PATCH] linux compilation fix

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4868 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 common/include/Utilities/Threading.h | 4 ++++
 pcsx2/CMakeLists.txt                 | 2 ++
 pcsx2/VU1microInterp.cpp             | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/include/Utilities/Threading.h b/common/include/Utilities/Threading.h
index 6e6edb1e9d..eb6ea2625f 100644
--- a/common/include/Utilities/Threading.h
+++ b/common/include/Utilities/Threading.h
@@ -408,7 +408,11 @@ namespace Threading
 		ScopedLock m_lock;
 		volatile __aligned(4) bool& m_bool;
 
+#ifdef __LINUX__
+		ScopedLockBool(Mutex& mutexToLock, volatile bool& isLockedBool)
+#else
 		ScopedLockBool(Mutex& mutexToLock, volatile __aligned(4) bool& isLockedBool)
+#endif
 			: m_lock(mutexToLock),
 			  m_bool(isLockedBool) {
 			m_bool = m_lock.IsLocked();
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index ef7927f6ed..1c6f5a7c56 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -141,6 +141,7 @@ set(pcsx2Sources
 	Memory.cpp
 	MMI.cpp
 	MTGS.cpp
+    MTVU.cpp
 	Patch.cpp
 	Patch_Memory.cpp
 	Pcsx2Config.cpp
@@ -205,6 +206,7 @@ set(pcsx2Headers
 	IopMem.h
 	IopSio2.h
 #	Mdec.h
+    MTVU.h
 	Memory.h
 	MemoryTypes.h
 	NakedAsm.h
diff --git a/pcsx2/VU1microInterp.cpp b/pcsx2/VU1microInterp.cpp
index 7e575598a0..7681699b2e 100644
--- a/pcsx2/VU1microInterp.cpp
+++ b/pcsx2/VU1microInterp.cpp
@@ -178,7 +178,7 @@ void InterpVU1::Reset() {
 	vu1Thread.WaitVU();
 }
 
-void InterpVU1::Shutdown() {
+void InterpVU1::Shutdown() throw() {
 	vu1Thread.WaitVU();
 }