From 09cec4a370e2951ca37f27c2d6c531d534179a3c Mon Sep 17 00:00:00 2001
From: cottonvibes <cottonvibes@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Thu, 10 Dec 2009 02:32:34 +0000
Subject: [PATCH] fix for the annoying msvc warnings

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2334 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/GS.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcsx2/GS.h b/pcsx2/GS.h
index 15c58a4e45..3e96ea0f80 100644
--- a/pcsx2/GS.h
+++ b/pcsx2/GS.h
@@ -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