newHostVM: Some Linux compilation fixes, warning removals.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/newHostVM@4023 96395faa-99c1-11dd-bbfe-3dabce05a288

common/src/Utilities/Linux/LnxHostSys.cpp

@@ -17,6 +17,8 @@
 #include "../PrecompiledHeader.h"
 #include "PageFaultSource.h"
 
+#include <wx/thread.h>
+
 #include <sys/mman.h>
 #include <signal.h>
 #include <errno.h>
@@ -169,7 +171,7 @@ void HostSys::MmapResetPtr(void* base, size_t size)
 
 	pxAssertRel ((uptr)result != (uptr)base, pxsFmt(
 		"Virtual memory decommit failed: memory at 0x%08X -> 0x%08X could not be remapped.  "
-		"This is likely caused by multi-thread memory contention.", base, base+size
+		"This is likely caused by multi-thread memory contention.", base, (uptr)base+size
 	));
 }
 

pcsx2/CDVD/IsoFileFormats.cpp

@@ -78,7 +78,6 @@ bool isoFile::tryIsoType(u32 _size, s32 _offset, s32 _blockofs)
 bool isoFile::Detect( bool readType )
 {
 	char buf[32];
-	int len = m_filename.Length();
 
 	m_type = ISOTYPE_ILLEGAL;
 

pcsx2/Memory.cpp

@@ -92,7 +92,6 @@ static vtlbHandler
 	null_handler,
 
 	tlb_fallback_0,
-	tlb_fallback_1,
 	tlb_fallback_2,
 	tlb_fallback_3,
 	tlb_fallback_4,

pcsx2/PluginManager.cpp

@@ -1278,7 +1278,7 @@ void SysCorePlugins::Init( PluginsEnum_t pid )
 	if( !m_info[pid] || m_info[pid]->IsInitialized ) return;
 
 	Console.Indent().WriteLn( "Init %s", tbl_PluginInfo[pid].shortname );
-	if( NULL != m_info[pid]->CommonBindings.Init() )
+	if( 0 != m_info[pid]->CommonBindings.Init() )
 		throw Exception::PluginInitError( pid );
 
 	m_info[pid]->IsInitialized = true;

pcsx2/gui/AppAssert.cpp

@@ -19,10 +19,6 @@
 
 #include <wx/stackwalk.h>
 
-static wxString pxGetStackTrace( const FnChar_t* calledFrom )
-{
-    wxString stackTrace;
-
 class StackDump : public wxStackWalker
 {
 protected:
@@ -84,14 +80,14 @@ static wxString pxGetStackTrace( const FnChar_t* calledFrom )
 			//briefName.Printf( L"(%s:%d)", wxfn.GetFullName().c_str(), frame.GetLine() );
 
 			wxfn.SetVolume( wxEmptyString );
-				int count = wxfn.GetDirCount();
+			//int count = wxfn.GetDirCount();
 			for( int i=0; i<2; ++i )
 				wxfn.RemoveDir(0);
 
 			essenName.Printf( L"%s:%d", wxfn.GetFullPath().c_str(), frame.GetLine() );
 		}
 
-            m_stackTrace += wxString::Format( L"[%02d] %-44s %s\n",
+		m_stackTrace += pxsFmt( L"[%02d] %-44s %s\n",
 			frame.GetLevel()-m_skipped,
 			name.c_str(),
 			essenName.c_str()
@@ -99,6 +95,8 @@ static wxString pxGetStackTrace( const FnChar_t* calledFrom )
 	}
 };
 
+static wxString pxGetStackTrace( const FnChar_t* calledFrom )
+{
 	StackDump dump( calledFrom );
 	dump.Walk( 3 );
 	return dump.GetStackTrace();

pcsx2/vtlb.cpp

@@ -35,7 +35,7 @@
 #include "COP0.h"
 #include "R5900Exceptions.h"
 
-#include "Utilities\MemsetFast.inl"
+#include "Utilities/MemsetFast.inl"
 
 using namespace R5900;
 using namespace vtlb_private;