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

Externs should not be static. Reconcile a few variable types as well, and pass the Console C strings rather then C++. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@701 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2009-02-05 12:24:14 +00:00 committed by Gregory Hainaut
parent 527216b091
commit fbe47fbc41
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CDVDiso.h
View File

@ -134,7 +134,7 @@ struct dirTocEntry
u8 fileProperties;
u8 reserved2[6];
u8 filenameLength;
s8 filename[128];
char filename[128];
#if defined(_MSC_VER)
};
#else

2
pcsx2/Console.cpp
View File

@ -30,7 +30,7 @@ const _VARG_PARAM va_arg_dummy = { 0 };
namespace Console
{
static __forceinline void __fastcall _WriteLn( Colors color, const char* fmt, va_list args )
__forceinline void __fastcall _WriteLn( Colors color, const char* fmt, va_list args )
{
SetColor( color );
WriteLn( vfmt_string( fmt, args ).c_str() );

2
pcsx2/DebugTools/DisR5900.cpp
View File

@ -1063,7 +1063,7 @@ TdisR5900F disR5900[] = {
disNULL , disLWC1 , disNULL, disPREF , disNULL, disNULL, disLQC2 , disLD ,
disNULL , disSWC1 , disNULL, disNULL , disNULL, disNULL, disSQC2 , disSD };
static void disR5900F( string& output, u32 code )
void disR5900F( string& output, u32 code )
{
disR5900[code >> 26]( output, code );
}

8
pcsx2/Linux/GtkGui.cpp
View File

@ -395,7 +395,7 @@ void States_Load(string file, int num = -1 )
if( num != -1 )
Msgbox::Alert("Savestate slot %d is an unsupported version." , params num);
else
Msgbox::Alert( "%s : This is an unsupported savestate version." , params file);
Msgbox::Alert( "%s : This is an unsupported savestate version." , params file.c_str());
// At this point the cpu hasn't been reset, so we can return
// control to the user safely...
@ -407,7 +407,7 @@ void States_Load(string file, int num = -1 )
if (num != -1)
Console::Error("Error occured while trying to load savestate slot %d", params num);
else
Console::Error("Error occured while trying to load savestate file: %d", params file);
Console::Error("Error occured while trying to load savestate file: %d", params file.c_str());
Console::Error( "%s", params ex.what() );
@ -447,14 +447,14 @@ void States_Save( string file, int num = -1 )
if( num != -1 )
Console::Notice("State saved to slot %d", params num );
else
Console::Notice( "State saved to file: %s", params file );
Console::Notice( "State saved to file: %s", params file.c_str() );
}
catch( std::exception& ex )
{
if( num != -1 )
Msgbox::Alert("An error occurred while trying to save to slot %d", params num );
else
Msgbox::Alert("An error occurred while trying to save to file: %s", params file );
Msgbox::Alert("An error occurred while trying to save to file: %s", params file.c_str() );
Console::Error("Save state request failed with the following error:" );
Console::Error( "%s", params ex.what() );

4
pcsx2/VU0microInterp.cpp
View File

@ -195,11 +195,11 @@ void vu0Exec(VURegs* VU)
namespace VU0micro
{
static void intAlloc()
void intAlloc()
{
}
static void intShutdown()
void intShutdown()
{
}

4
pcsx2/x86/ix86/ix86.h
View File

@ -150,9 +150,9 @@ struct CPUINFO{
u32 PhysicalCores;
u32 LogicalCores;
s8 x86ID[16]; // Vendor ID //the vendor creator (in %s)
char x86ID[16]; // Vendor ID //the vendor creator (in %s)
char x86Type[20]; //cpu type in char format //the cpu type (in %s)
s8 x86Fam[50]; // family in char format //the original cpu name string (in %s)
char x86Fam[50]; // family in char format //the original cpu name string (in %s)
u32 cpuspeed; // speed of cpu //this will give cpu speed (in %d)
};