ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wxIsoFile: ... and some more fixes. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxIsoFile@3944 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-10-19 09:25:44 +00:00
parent ca9e250837
commit e30892cf34
3 changed files with 438 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/include/Utilities/General.h
View File

@ -176,14 +176,3 @@ extern u64 GetTickFrequency();
extern u64 GetCPUTicks(); extern u64 GetCPUTicks();
extern wxString GetOSVersionString(); extern wxString GetOSVersionString();
extern void* __fastcall pcsx2_aligned_malloc(size_t size, size_t align);
extern void* __fastcall pcsx2_aligned_realloc(void* handle, size_t size, size_t align);
extern void pcsx2_aligned_free(void* pmem);
// aligned_malloc: Implement/declare linux equivalents here!
#if !defined(_MSC_VER) && !defined(HAVE_ALIGNED_MALLOC)
# define _aligned_malloc pcsx2_aligned_malloc
# define _aligned_free pcsx2_aligned_free
# define _aligned_realloc pcsx2_aligned_realloc
#endif

15
common/include/Utilities/ScopedAlloc.h
View File

@ -48,6 +48,19 @@
#define safe_aligned_free( ptr ) \ #define safe_aligned_free( ptr ) \
((void) ( _aligned_free( ptr ), (ptr) = NULL )) ((void) ( _aligned_free( ptr ), (ptr) = NULL ))
extern void* __fastcall pcsx2_aligned_malloc(size_t size, size_t align);
extern void* __fastcall pcsx2_aligned_realloc(void* handle, size_t size, size_t align);
extern void pcsx2_aligned_free(void* pmem);
// aligned_malloc: Implement/declare linux equivalents here!
#if !defined(_MSC_VER) && !defined(HAVE_ALIGNED_MALLOC)
# define _aligned_malloc pcsx2_aligned_malloc
# define _aligned_free pcsx2_aligned_free
# define _aligned_realloc pcsx2_aligned_realloc
#endif
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// BaseScopedAlloc // BaseScopedAlloc
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -188,7 +201,7 @@ template< typename T, uint align >
class ScopedAlignedAlloc : public BaseScopedAlloc<T> class ScopedAlignedAlloc : public BaseScopedAlloc<T>
{ {
public: public:
ScopedAlignedAlloc( size_t size=0 ) : BaseScopedAlloc() ScopedAlignedAlloc( size_t size=0 ) : BaseScopedAlloc<T>()
{ {
Alloc(size); Alloc(size);
} }

1
common/src/Utilities/pxStreams.cpp
View File

@ -19,6 +19,7 @@
#include <wx/stream.h> #include <wx/stream.h>
#include <errno.h>
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// pxStreamReader (implementations) // pxStreamReader (implementations)