From 03ea6e04d637153cd4efbd7901b2ebdef8a1d469 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Mon, 29 Mar 2010 21:15:49 +0000
Subject: [PATCH] zzogl-pg: part two of fixing CreateWindow conflict; should
 compile in Windows without error now.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2793 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/zzogl-pg/opengl/GLWin32.cpp | 2 +-
 plugins/zzogl-pg/opengl/GSmain.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/zzogl-pg/opengl/GLWin32.cpp b/plugins/zzogl-pg/opengl/GLWin32.cpp
index 2bca854f90..325de6c5e8 100644
--- a/plugins/zzogl-pg/opengl/GLWin32.cpp
+++ b/plugins/zzogl-pg/opengl/GLWin32.cpp
@@ -69,7 +69,7 @@ LRESULT WINAPI MsgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 	return DefWindowProc( hWnd, msg, wParam, lParam );
 }
 
-bool GLWindow::CreateGLWindow(void *pDisplay)
+bool GLWindow::CreateWindow(void *pDisplay)
 {       
 	RECT rc, rcdesktop;
 	rc.left = 0; rc.top = 0;
diff --git a/plugins/zzogl-pg/opengl/GSmain.cpp b/plugins/zzogl-pg/opengl/GSmain.cpp
index 809e63e826..9b1d288d54 100644
--- a/plugins/zzogl-pg/opengl/GSmain.cpp
+++ b/plugins/zzogl-pg/opengl/GSmain.cpp
@@ -547,7 +547,7 @@ s32 CALLBACK GSopen(void *pDsp, char *Title, int multithread)
 	LoadConfig();
 
 	strcpy(GStitle, Title);
-	err = GLWin.CreateGLWindow(pDsp);
+	err = GLWin.CreateWindow(pDsp);
 
 	if (!err) 
 	{