From c696c409242332917917678628f994b6dd3cba76 Mon Sep 17 00:00:00 2001
From: gigaherz <gigaherz@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sun, 19 Aug 2012 20:03:47 +0000
Subject: [PATCH] ZeroGS/vs2012: "count" is a function in the vs2012's std::
 namespace, so it conflicts to use count as a variable when "using namespace
 std;" is in place. Renamed the two instances of that issue to "counter".

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5385 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/zerogs/dx/GSmain.cpp        |  6 +++---
 plugins/zerogs/dx/Windows/aviUtil.h | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/zerogs/dx/GSmain.cpp b/plugins/zerogs/dx/GSmain.cpp
index 8da09281c3..90031c1c8e 100644
--- a/plugins/zerogs/dx/GSmain.cpp
+++ b/plugins/zerogs/dx/GSmain.cpp
@@ -965,7 +965,7 @@ void CALLBACK GSgifTransfer3(u32 *pMem, u32 size)
 	_GSgifTransfer(&gs.path3, pMem, size);
 }
 
-static int count = 0;
+static int counter = 0;
 void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr)
 {
 	pathInfo *path = &gs.path1;
@@ -975,8 +975,8 @@ void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr)
 	addr &= 0x3fff;
 
 #ifdef PCSX2_DEBUG
-	PRIM_LOG("count: %d\n", count);
-	count++;
+	PRIM_LOG("count: %d\n", counter);
+	counter++;
 #endif
 
 	gs.path1.tag.nloop = 0;
diff --git a/plugins/zerogs/dx/Windows/aviUtil.h b/plugins/zerogs/dx/Windows/aviUtil.h
index 8ab371dd15..d4ff61baae 100644
--- a/plugins/zerogs/dx/Windows/aviUtil.h
+++ b/plugins/zerogs/dx/Windows/aviUtil.h
@@ -348,7 +348,7 @@ BOOL AVI_Exit()
 static PAVIFILE pfile = NULL;
 static PAVISTREAM ps = NULL;
 static PAVISTREAM psCompressed = NULL;
-static int count = 0;
+static int counter = 0;
 
 
 // Initialization...
@@ -371,7 +371,7 @@ bool START_AVI(const char* file_name)
 
 bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int width, int height, int bits, void* pdata)
 {
-	if(count == 0)
+	if(counter == 0)
 	{
 		if(! AVI_CreateStream(pfile, &ps, _frameRate,
 			width*height/bits,
@@ -398,7 +398,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt
 	}
 
 	HRESULT hr = AVIStreamWrite(psCompressed, // stream pointer
-		count, // time of this frame
+		counter, // time of this frame
 		1, // number to write
 		pdata,
 		width*height/8, // lpbi->biSizeImage, // size of this frame
@@ -413,7 +413,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt
 		return FALSE;
 	}
 
-	count++;
+	counter++;
 	return true;
 }
 
@@ -422,7 +422,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt
 bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRate)
 {
 	LPBITMAPINFOHEADER lpbi;
-	if(count == 0)
+	if(counter == 0)
 	{
 		lpbi = (LPBITMAPINFOHEADER)GlobalLock(dib);
 		if(! AVI_CreateStream(pfile, &ps, _frameRate,
@@ -446,7 +446,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRa
 	}
 
 	lpbi = (LPBITMAPINFOHEADER)GlobalLock(dib);
-	if(! AVI_AddFrame(psCompressed, count * 1, lpbi))
+	if(! AVI_AddFrame(psCompressed, counter * 1, lpbi))
 	{
 		//printf("Error - AVI_AddFrame()\n");
 		GlobalUnlock(lpbi);
@@ -454,7 +454,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRa
 	}
 
 	GlobalUnlock(lpbi);
-	count++;
+	counter++;
 	return true;
 }