From b7f2af116093038f90b15e27469eaeabb3764bb1 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Mon, 28 Jun 2010 03:01:06 +0000
Subject: [PATCH] zzogl-pg: fix a warning on win32, and remove the non-existent
 gssoft.def file form the vsproj.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3329 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 .../opengl/Win32/zerogsogl_2008.vcproj        | 32 ++++++++-----------
 plugins/zzogl-pg/opengl/targets.cpp           |  2 +-
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
index 6a0aa14ef8..804b473a9a 100644
--- a/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
+++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
@@ -269,10 +269,6 @@
 				RelativePath="..\GSmain.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\GSsoftdx.def"
-				>
-			</File>
 			<File
 				RelativePath="..\Mem.cpp"
 				>
@@ -289,6 +285,10 @@
 				RelativePath="..\memcpy_amd.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\Profile.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\rasterfont.cpp"
 				>
@@ -297,10 +297,6 @@
 				RelativePath="..\Regs.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\Profile.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\targets.cpp"
 				>
@@ -389,20 +385,16 @@
 				RelativePath=".\aviUtil.h"
 				>
 			</File>
-			<File
-				RelativePath="..\GifTransfer.h"
-				>
-			</File>
 			<File
 				RelativePath="..\CRC.h"
 				>
 			</File>
 			<File
-				RelativePath="..\GS.h"
+				RelativePath="..\GifTransfer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Util.h"
+				RelativePath="..\GS.h"
 				>
 			</File>
 			<File
@@ -417,6 +409,10 @@
 				RelativePath="..\Mem_Transmit.h"
 				>
 			</File>
+			<File
+				RelativePath="..\Profile.h"
+				>
+			</File>
 			<File
 				RelativePath="..\PS2Edefs.h"
 				>
@@ -433,10 +429,6 @@
 				RelativePath="..\Regs.h"
 				>
 			</File>
-			<File
-				RelativePath="..\Profile.h"
-				>
-			</File>
 			<File
 				RelativePath="resource.h"
 				>
@@ -449,6 +441,10 @@
 				RelativePath="..\targets.h"
 				>
 			</File>
+			<File
+				RelativePath="..\Util.h"
+				>
+			</File>
 			<File
 				RelativePath="Win32.h"
 				>
diff --git a/plugins/zzogl-pg/opengl/targets.cpp b/plugins/zzogl-pg/opengl/targets.cpp
index 4c5b3477af..d391ae1bd2 100644
--- a/plugins/zzogl-pg/opengl/targets.cpp
+++ b/plugins/zzogl-pg/opengl/targets.cpp
@@ -1664,7 +1664,7 @@ int memcmp_clut16(u16* pSavedBuffer, u16* pClutBuffer, int clutsize)
 
 	// left > 0 only when csa < 16
 	int left = 0;
-	if ((u32)(uptr)pClutBuffer & 2 == 0)
+	if (((u32)(uptr)pClutBuffer & 2) == 0)
 	{
 		left = (((u32)(uptr)pClutBuffer & 0x3ff) / 2) + clutsize - 512;
 		clutsize -= left;