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

Fix compilation errors. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2167 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-11-08 21:43:04 +00:00
parent b562e8aa0f
commit f2b32b57aa
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CDVD/IsoFS/IsoFS.h
View File

@ -7,5 +7,5 @@ struct ISoFileDescriptor;
#include "SectorSource.h" #include "SectorSource.h"
#include "IsoFileDescriptor.h" #include "IsoFileDescriptor.h"
#include "IsoDirectory.h" #include "IsoDirectory.h"
#include "ISoFile.h" #include "IsoFile.h"

2
pcsx2/CDVD/IsoFS/IsoFSCDVD.cpp
View File

@ -19,6 +19,6 @@ int IsoFSCDVD::getNumSectors()
return td.lsn; return td.lsn;
} }
IsoFSCDVD::~IsoFSCDVD(void) IsoFSCDVD::~IsoFSCDVD(void) throw()
{ {
} }

4
pcsx2/Elfheader.cpp
View File

@ -587,8 +587,10 @@ void loadElfFile(const wxString& filename)
{ {
if( memcmp( "rom0:OSDSYS", (char*)PSM( i ), 11 ) == 0 ) if( memcmp( "rom0:OSDSYS", (char*)PSM( i ), 11 ) == 0 )
{ {
char* temp;
strcpy( (char*)PSM( i ), fnptr ); strcpy( (char*)PSM( i ), fnptr );
DevCon.WriteLn( "loadElfFile: addr %x \"%s\" -> \"%s\"", i, "rom0:OSDSYS", fnptr ); strcpy(temp, fnptr); // Passing wxCharBuffers to WriteLn crashes pcsx2.
DevCon.WriteLn( "loadElfFile: addr %x \"%s\" -> \"%s\"", i, "rom0:OSDSYS", temp );
} }
} }