From d843f4bcc374e66f3a068afbe9bd5d25ce9ebbbb Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Mon, 17 May 2010 15:56:41 +0000
Subject: [PATCH] zzogl-pg: fixed a whole bunch of signed/unsigned warnings in
 Mem_Transit, and a macro redefinition warning.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3036 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/zzogl-pg/opengl/Mem_Transmit.h | 8 ++++----
 plugins/zzogl-pg/opengl/Util.h         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/zzogl-pg/opengl/Mem_Transmit.h b/plugins/zzogl-pg/opengl/Mem_Transmit.h
index 876a020095..b173702e73 100644
--- a/plugins/zzogl-pg/opengl/Mem_Transmit.h
+++ b/plugins/zzogl-pg/opengl/Mem_Transmit.h
@@ -12,7 +12,7 @@ extern u8* pstart;
 
 // transfers whole rows
 template <class T>
-static __forceinline const T *TransmitHostLocalY_(_writePixel_0 wp, u32 widthlimit, u32 endY, const T *buf)
+static __forceinline const T *TransmitHostLocalY_(_writePixel_0 wp, s32 widthlimit, int endY, const T *buf)
 {
 	assert((nSize % widthlimit) == 0 && widthlimit <= 4);
 
@@ -73,7 +73,7 @@ static __forceinline const T *TransmitHostLocalY_(_writePixel_0 wp, u32 widthlim
 
 // transfers whole rows
 template <class T>
-static __forceinline const T *TransmitHostLocalY_24(_writePixel_0 wp, u32 widthlimit, u32 endY, const T *buf)
+static __forceinline const T *TransmitHostLocalY_24(_writePixel_0 wp, s32 widthlimit, int endY, const T *buf)
 {
 	if (widthlimit != 8 || ((gs.imageEndX - gs.trxpos.dx) % widthlimit))
 	{
@@ -146,7 +146,7 @@ static __forceinline const T *TransmitHostLocalY_24(_writePixel_0 wp, u32 widthl
 
 // meant for 4bit transfers
 template <class T>
-static __forceinline const T *TransmitHostLocalY_4(_writePixel_0 wp, u32 widthlimit, u32 endY, const T *buf)
+static __forceinline const T *TransmitHostLocalY_4(_writePixel_0 wp, s32 widthlimit, int endY, const T *buf)
 {
 	for (; tempY < endY; ++tempY)
 	{
@@ -194,7 +194,7 @@ static __forceinline const T *TransmitHostLocalY_4(_writePixel_0 wp, u32 widthli
 }
 
 template <class T>
-static __forceinline const T *TransmitHostLocalY(TransferData data, _writePixel_0 wp, u32 widthlimit, u32 endY, const T *buf)
+static __forceinline const T *TransmitHostLocalY(TransferData data, _writePixel_0 wp, s32 widthlimit, int endY, const T *buf)
 {
 	switch (data.psm)
 	{
diff --git a/plugins/zzogl-pg/opengl/Util.h b/plugins/zzogl-pg/opengl/Util.h
index 100a0c12f5..8d2e129726 100644
--- a/plugins/zzogl-pg/opengl/Util.h
+++ b/plugins/zzogl-pg/opengl/Util.h
@@ -224,7 +224,7 @@ static bool SPAM_PASS;
 #endif
 
 //#define WRITE_PRIM_LOGS
-#ifdef _DEBUG
+#if defined(_DEBUG) && !defined(ZEROGS_DEVBUILD)
 #define ZEROGS_DEVBUILD
 #endif