From d5bc947e8dda278a12d036a239cd609d7d955fda Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Mon, 18 Oct 2010 15:46:05 +0000
Subject: [PATCH] wxIsoFile branch: fix missing includes and gcc compilation
 stuffs.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxIsoFile@3941 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 common/include/Utilities/Dependencies.h  |  2 +-
 common/include/Utilities/Exceptions.h    |  2 +-
 common/include/Utilities/ScopedAlloc.h   | 30 ++++++++++++------------
 common/include/Utilities/StringHelpers.h |  2 +-
 common/src/Utilities/Exceptions.cpp      |  2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/include/Utilities/Dependencies.h b/common/include/Utilities/Dependencies.h
index 68f0be1b70..5683751d4c 100644
--- a/common/include/Utilities/Dependencies.h
+++ b/common/include/Utilities/Dependencies.h
@@ -231,5 +231,5 @@ extern bool pxIsEnglish( int id );
 #define pxE(key, english)			pxExpandMsg( wxT(key),						english )
 
 #include "Utilities/ScopedPtr.h"
-#include "Utilities/ScopedMalloc.h"
+#include "Utilities/ScopedAlloc.h"
 #include "Utilities/Assertions.h"
diff --git a/common/include/Utilities/Exceptions.h b/common/include/Utilities/Exceptions.h
index c58b15a4fa..b1e3557705 100644
--- a/common/include/Utilities/Exceptions.h
+++ b/common/include/Utilities/Exceptions.h
@@ -43,7 +43,7 @@
 namespace Exception
 {
 	int MakeNewType();
-	BaseException* FromErrno( const wxString& streamname, errno_t errcode );
+	BaseException* FromErrno( const wxString& streamname, int errcode );
 
 	// --------------------------------------------------------------------------------------
 	//  BaseException
diff --git a/common/include/Utilities/ScopedAlloc.h b/common/include/Utilities/ScopedAlloc.h
index a5817953f7..a6350f4204 100644
--- a/common/include/Utilities/ScopedAlloc.h
+++ b/common/include/Utilities/ScopedAlloc.h
@@ -154,21 +154,21 @@ public:
 
 	virtual void Alloc( size_t newsize )
 	{
-		safe_free(m_buffer);
-		m_size = newsize;
+		safe_free(this->m_buffer);
+		this->m_size = newsize;
 		if (!m_size) return;
 
-		m_buffer = (T*)malloc( m_size * sizeof(T) );
-		if (!m_buffer)
+		this->m_buffer = (T*)malloc( m_size * sizeof(T) );
+		if (!this->m_buffer)
 			throw Exception::OutOfMemory("ScopedAlloc");
 	}
 
 	virtual void Resize( size_t newsize )
 	{
-		m_size		= newsize;
-		m_buffer	= (T*)realloc(m_buffer * sizeof(T), newsize);
+		this->m_size		= newsize;
+		this->m_buffer	= (T*)realloc(this->m_buffer * sizeof(T), newsize);
 
-		if (!m_buffer)
+		if (!this->m_buffer)
 			throw Exception::OutOfMemory("ScopedAlloc::Resize");
 	}
 };
@@ -198,21 +198,21 @@ public:
 
 	virtual void Alloc( size_t newsize )
 	{
-		safe_aligned_free(m_buffer);
-		m_size = newsize;
-		if (!m_size) return;
+		safe_aligned_free(this->m_buffer);
+		this->m_size = newsize;
+		if (!this->m_size) return;
 
-		m_buffer = (T*)_aligned_malloc( m_size * sizeof(T), align );
-		if (!m_buffer)
+		this->m_buffer = (T*)_aligned_malloc( this->m_size * sizeof(T), align );
+		if (!this->m_buffer)
 			throw Exception::OutOfMemory(L"ScopedAlignedAlloc");
 	}
 
 	virtual void Resize( size_t newsize )
 	{
-		m_size		= newsize;
-		m_buffer	= (T*)_aligned_realloc(m_buffer, newsize * sizeof(T), align);
+		this->m_size		= newsize;
+		this->m_buffer	= (T*)_aligned_realloc(this->m_buffer, newsize * sizeof(T), align);
 
-		if (!m_buffer)
+		if (!this->m_buffer)
 			throw Exception::OutOfMemory(L"ScopedAlignedAlloc::Resize");
 	}
 };
diff --git a/common/include/Utilities/StringHelpers.h b/common/include/Utilities/StringHelpers.h
index e7b565e764..9b41976a99 100644
--- a/common/include/Utilities/StringHelpers.h
+++ b/common/include/Utilities/StringHelpers.h
@@ -17,7 +17,7 @@
 
 #include "Dependencies.h"
 #include "SafeArray.h"
-#include "ScopedMalloc.h"
+#include "ScopedAlloc.h"
 
 #include <wx/tokenzr.h>
 
diff --git a/common/src/Utilities/Exceptions.cpp b/common/src/Utilities/Exceptions.cpp
index e9030e35d4..3249ddc737 100644
--- a/common/src/Utilities/Exceptions.cpp
+++ b/common/src/Utilities/Exceptions.cpp
@@ -245,7 +245,7 @@ wxString Exception::Stream::FormatDisplayMessage() const
 
 // Translates an Errno code into an exception.
 // Throws an exception based on the given error code (usually taken from ANSI C's errno)
-BaseException* Exception::FromErrno( const wxString& streamname, errno_t errcode )
+BaseException* Exception::FromErrno( const wxString& streamname, int errcode )
 {
 	pxAssumeDev( errcode != 0, "Invalid NULL error code?  (errno)" );