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

fix for the annoying msvc warnings 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2334 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
cottonvibes 2009-12-10 02:32:34 +00:00
parent 86a75775f3
commit 09cec4a370
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/GS.h
View File

@ -84,7 +84,7 @@ union tGS_CSR
setIntBits(_u64 & ~value._u64);
}
bool interrupts() { return (SIGNAL | FINISH | HSINT | VSINT | EDWINT); }
bool interrupts() { return (SIGNAL || FINISH || HSINT || VSINT || EDWINT); }
void setAllInterrupts(bool value)
{
@ -122,7 +122,7 @@ union tGS_IMR
undefined = 0x3; // These should always be set.
}
bool masked() { return (SIGMSK | FINISHMSK | HSMSK | VSMSK | EDWMSK); }
bool masked() { return (SIGMSK || FINISHMSK || HSMSK || VSMSK || EDWMSK); }
};
#define PS2MEM_GS g_RealGSMem