Linux build fixes and some warning cleanup for GCC

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2406 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Common/Src/FixedSizeQueue.h

@@ -83,4 +83,5 @@ public:
 	}
 };
 
-#endif  // _FIXED_SIZE_QUEUE_H
+#endif  // _FIXED_SIZE_QUEUE_H
+

Source/Core/Common/Src/Setup.h

@@ -66,4 +66,5 @@
 
 ///////////////////////////
 
-#endif // __SETUP_h__
+#endif // __SETUP_h__
+

Source/Core/Common/Src/Thread.cpp

@@ -414,7 +414,7 @@ Thread::~Thread()
 }
 
 
-void Thread::WaitForDeath(const int _Wait)
+void Thread::WaitForDeath()
 {
 	if (thread_id)
 	{

Source/Core/Common/Src/Thread.h

@@ -37,7 +37,6 @@
 #include "Common.h"
 ///////////////////////////////////
 
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Definitions
 // ------------
@@ -89,7 +88,11 @@ public:
 
 	void SetAffinity(int mask);
 	static void SetCurrentThreadAffinity(int mask);
+#ifdef _WIN32
 	void WaitForDeath(const int _Wait = INFINITE);
+#else
+	void WaitForDeath();
+#endif
 
 private:
 

Source/Core/Core/Src/Boot/Boot_WiiWAD.h

@@ -32,4 +32,5 @@ struct STileMetaContent
 
 // [TODO]: this global internal stuff sux... the whole data should be inside the ES
 // but this is the easiest way atm
-extern std::vector<STileMetaContent> m_TileMetaContent;
+extern std::vector<STileMetaContent> m_TileMetaContent;
+

Source/Core/Core/Src/Core.cpp

@@ -302,7 +302,11 @@ void Stop()
 		if (GetParent((HWND)g_pWindowHandle) == NULL)
 	#endif
 #ifndef SETUP_TIMER_WAITING // This is moved
+#ifdef _WIN32
 	g_EmuThread->WaitForDeath(5000);
+#else
+	g_EmuThread->WaitForDeath();
+#endif
 	delete g_EmuThread;  // Wait for emuthread to close.
 	g_EmuThread = 0;
 #endif
@@ -575,7 +579,11 @@ void EmuThreadEnd()
 	if (cpuThread)
 	{
 		// There is a CPU thread - join it.
+#ifdef _WIN32
 		cpuThread->WaitForDeath(5000);
+#else
+		cpuThread->WaitForDeath();
+#endif
 		delete cpuThread;
 		// Returns after game exited
 		cpuThread = NULL;

Source/Core/Core/Src/IPC_HLE/HW/SDInterface.cpp

@@ -40,4 +40,5 @@ void SetSourcePath(const std::string path)
 {
 	sourcePath = path;
 }
-}
+}
+

Source/Core/Core/Src/IPC_HLE/HW/SDInterface.h

@@ -28,4 +28,5 @@ namespace SDInterface
 	void SetSourcePath(const std::string path);
 }
 
-#endif
+#endif
+

Source/Core/DolphinWX/Src/CheatsWindow.h

@@ -127,4 +127,5 @@ class wxCheatsWindow : public wxFrame
 		void OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& event);
 };
 
-#endif
+#endif
+

Source/Core/DolphinWX/Src/GameListCtrl.cpp

@@ -281,7 +281,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
 			wxString::From8BitData(rISOFile.GetDescription((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1);
 		break;
 	}
-
 	SetItem(_Index, COLUMN_COMPANY, wxString::From8BitData(rISOFile.GetCompany().c_str()), -1);
 	
 	SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1);
@@ -942,4 +941,5 @@ bool CGameListCtrl::CopySJISToString( wxString& _rDestination, const char* _src
 	//returnCode = true;
 #endif
 	return returnCode;
-}
+}
+

Source/Core/DolphinWX/Src/SDCardWindow.cpp

@@ -60,4 +60,5 @@ void wxSDCardWindow::OnEvent_Window_Close(wxCloseEvent& WXUNUSED(event))
 void wxSDCardWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED(event))
 {
 	EndModal(0);
-}
+}
+

Source/Core/DolphinWX/Src/SDCardWindow.h

@@ -42,4 +42,5 @@ protected:
 };
 
 
-#endif
+#endif
+

Source/Core/InputCommon/Src/Configuration.cpp

@@ -249,4 +249,5 @@ std::string VKToString(int keycode)
 #endif
 /////////////////////////////////////////////////////////////////////
 
-}
+}
+

Source/Core/InputCommon/Src/SDL.cpp

@@ -363,4 +363,5 @@ void GetButton(SDL_Joystick *joy, int ControllerID, int buttons, int axes, int h
 
 
 
-} // InputCommon
+} // InputCommon
+

Source/Core/InputCommon/Src/XInput.h

@@ -42,4 +42,5 @@ bool IsConnected(int Controller);
 
 } // XInput
 
-#endif
+#endif
+

Source/Core/VideoCommon/Src/ImageWrite.h

@@ -24,4 +24,5 @@ bool SaveTGA(const char* filename, int width, int height, void* pdata);
 bool SaveTexture(const char* filename, u32 textarget, u32 tex, int width, int height);
 bool SaveData(const char* filename, const char* pdata);
 
-#endif  // _IMAGEWRITE_H
+#endif  // _IMAGEWRITE_H
+

Source/Core/VideoCommon/Src/NativeVertexWriter.cpp

@@ -23,4 +23,5 @@ namespace VertexManager
 
 u8* s_pCurBufferPointer = NULL;
 
-}
+}
+