From c26c92cffd50c53db23898ac57aa1f55775b09fa Mon Sep 17 00:00:00 2001
From: hrydgard <hrydgard@gmail.com>
Date: Wed, 10 Dec 2008 23:05:57 +0000
Subject: [PATCH] Fix some silly BOOL confusion

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1492 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/PluginSpecs/pluginspecs_video.h        | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 4 ----
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp   | 5 +----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Source/PluginSpecs/pluginspecs_video.h b/Source/PluginSpecs/pluginspecs_video.h
index f0939b43aa..0b8bf673a6 100644
--- a/Source/PluginSpecs/pluginspecs_video.h
+++ b/Source/PluginSpecs/pluginspecs_video.h
@@ -161,7 +161,7 @@ EXPORT void CALL Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dw
 // input:    Filename
 // output:   TRUE if all was okay
 //
-EXPORT BOOL CALL Video_Screenshot(TCHAR* _szFilename);
+EXPORT unsigned int CALL Video_Screenshot(TCHAR* _szFilename);
 
 // __________________________________________________________________________________________________
 // Function: Video_EnterLoop
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 9eedecc7f2..dd74804a26 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -89,11 +89,7 @@ void OpenGL_SetWindowText(const char *text)
 #endif
 }
 
-#if defined(OSX64)
 unsigned int  Callback_PeekMessages()
-#else
-BOOL Callback_PeekMessages()
-#endif
 {
 #ifdef _WIN32
     //TODO: peekmessage
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index d5218fda09..2e7ea692b6 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -336,11 +336,8 @@ bool ScreenShot(TCHAR *File)
     }
 	return false;
 }
-#if defined(OSX64)
+
 unsigned int Video_Screenshot(TCHAR* _szFilename)
-#else
-BOOL Video_Screenshot(TCHAR* _szFilename)
-#endif
 {
     if (ScreenShot(_szFilename))
         return TRUE;