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

Fixes some warnings and a compilation error in Intel C/C++. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1798 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-09-09 10:38:40 +00:00
parent cda84b6455
commit 380a66301f
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/PS2Edefs.h
View File

@ -619,7 +619,7 @@ typedef s32 (CALLBACK* _CDVDctrlTrayClose)();
typedef s32 (CALLBACK* _CDVDreadSector)(u8* buffer, u32 lsn, int mode);
typedef s32 (CALLBACK* _CDVDgetDualInfo)(s32* dualType, u32* _layer1start);
typedef void (CALLBACK* _CDVDnewDiskCB)(void (*callback)());
typedef void (CALLBACK* _CDVDnewDiskCB)(void (CALLBACK* callback)());
// DEV9

2
pcsx2/CDVD/CDVD.cpp
View File

@ -537,7 +537,7 @@ void cdvdDetectDisk()
}
}
void cdvdNewDiskCB()
void CALLBACK cdvdNewDiskCB()
{
DoCDVDresetDiskTypeCache();

2
pcsx2/CDVD/CDVD.h
View File

@ -138,6 +138,6 @@ extern void cdvdReadInterrupt();
// We really should not have a function with the exact same name as a callback except for case!
extern void cdvdDetectDisk();
extern void cdvdNewDiskCB();
extern void CALLBACK cdvdNewDiskCB();
extern u8 cdvdRead(u8 key);
extern void cdvdWrite(u8 key, u8 rt);

2
pcsx2/Vif.h
View File

@ -187,6 +187,7 @@ static __forceinline u32 getVifRowRegs(u32 reg)
break;
jNO_DEFAULT;
}
return 0; // unreachable...
}
static __forceinline u32 setVifColRegs(u32 reg, u32 data)
@ -228,6 +229,7 @@ static __forceinline u32 getVifColRegs(u32 reg)
break;
jNO_DEFAULT;
}
return 0; // unreachable...
}
#define vif0Regs ((VIFregisters*)&PS2MEM_HW[0x3800])

2
pcsx2/gui/Saveslots.cpp
View File

@ -56,7 +56,7 @@ void States_Load( const wxString& file )
Console::Notice( ex.FormatDiagnosticMessage() );
}
catch( Exception::BaseException& ex )
catch( Exception::BaseException& )
{
// VM state is probably ruined. We'll need to recover from the in-memory backup.
StateRecovery::Recover();