From 48927c17d252223ffdaa5cfb34aa850eb6ee6ee1 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 13 Apr 2013 00:54:11 -0500
Subject: [PATCH] Good job Windows. Stop choosing the same names as I do.

---
 Source/Core/VideoCommon/Src/OnScreenDisplay.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
index ffe0766e44..ddd5343bb9 100644
--- a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
+++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
@@ -41,14 +41,14 @@ struct MESSAGE
 	u32 dwTimeStamp;
 };
 
-class CALLBACK
+class OSDCALLBACK
 {
 private:
 	CallbackPtr m_functionptr;
 	CallbackType m_type;
 	u32 m_data;
 public:
-	CALLBACK(CallbackType OnType, CallbackPtr FuncPtr, u32 UserData)
+	OSDCALLBACK(CallbackType OnType, CallbackPtr FuncPtr, u32 UserData)
 	{
 		m_type = OnType;
 		m_functionptr = FuncPtr;
@@ -60,7 +60,7 @@ public:
 	}
 	CallbackType Type() { return m_type; }
 };
-std::vector<CALLBACK> m_callbacks;
+std::vector<OSDCALLBACK> m_callbacks;
 static std::list<MESSAGE> s_listMsgs;
 
 void AddMessage(const char* pstr, u32 ms)
@@ -111,7 +111,7 @@ void ClearMessages()
 // On-Screen Display Callbacks
 void AddCallback(CallbackType OnType, CallbackPtr FuncPtr, u32 UserData)
 {
-	m_callbacks.push_back(CALLBACK(OnType, FuncPtr, UserData));
+	m_callbacks.push_back(OSDCALLBACK(OnType, FuncPtr, UserData));
 }
 
 void DoCallbacks(CallbackType OnType)