From 7afc53c3a17ea3634da17c467b2e8233aca678d8 Mon Sep 17 00:00:00 2001
From: LPFaint99 <lpfaint99@gmail.com>
Date: Fri, 16 Jan 2009 02:58:34 +0000
Subject: [PATCH] Revert r1861

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1879 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Src/Common.h               |  1 -
 Source/Core/Common/Src/DriveUtil.cpp          |  1 +
 Source/Core/Common/Src/DynamicLibrary.cpp     | 10 +++++----
 Source/Core/Common/Src/FileSearch.cpp         |  2 ++
 Source/Core/Common/Src/FileUtil.cpp           |  1 +
 Source/Core/Common/Src/MappedFile.cpp         |  4 +++-
 Source/Core/Common/Src/MemArena.cpp           |  4 +++-
 Source/Core/Common/Src/MemArena.h             |  4 ++++
 Source/Core/Common/Src/MemoryUtil.cpp         |  4 +++-
 Source/Core/Common/Src/Thread.h               |  1 +
 Source/Core/Common/Src/Timer.cpp              |  1 +
 Source/Core/Core/Src/ARDecrypt.h              |  4 ++++
 Source/Core/Core/Src/Core.cpp                 | 22 ++++++++++++-------
 Source/Core/Core/Src/HW/CPUCompare.cpp        |  4 ++++
 Source/Core/DiscIO/Src/CompressedBlob.cpp     |  1 +
 .../Plugin_DSP_HLE/Src/Logging/Console.cpp    |  3 +++
 .../Plugin_DSP_LLE/Src/Logging/Logging.cpp    |  1 +
 Source/Plugins/Plugin_VideoDX9/Src/main.cpp   |  1 +
 Source/Plugins/Plugin_Wiimote/Src/Console.cpp |  7 ++++--
 19 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 09f932e9ff..a0fbeae3ea 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -24,7 +24,6 @@
 #define CHECK_HEAP_INTEGRITY()
 
 #ifdef _WIN32
-#include <windows.h>
 	#ifdef _DEBUG
 	#include <crtdbg.h>
 	#undef CHECK_HEAP_INTEGRITY
diff --git a/Source/Core/Common/Src/DriveUtil.cpp b/Source/Core/Common/Src/DriveUtil.cpp
index 660693425f..2d3cc7f8af 100644
--- a/Source/Core/Common/Src/DriveUtil.cpp
+++ b/Source/Core/Common/Src/DriveUtil.cpp
@@ -19,6 +19,7 @@
 #include "DriveUtil.h"
 
 #ifdef _WIN32
+#include <windows.h>
 #include <winioctl.h>
 #endif
 
diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp
index 0f9d4f56de..4b5f61af5f 100644
--- a/Source/Core/Common/Src/DynamicLibrary.cpp
+++ b/Source/Core/Common/Src/DynamicLibrary.cpp
@@ -18,7 +18,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // File description
-/* ŻŻŻŻŻŻŻŻŻŻŻŻŻ
+/* 
 
 All plugins from Core > Plugins are loaded and unloaded with this class when Dolpin is started
 and stopped.
@@ -27,9 +27,11 @@ and stopped.
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Includes
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 #include <string.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#include <windows.h>
+#else
 #include <dlfcn.h>
 #include <stdio.h>
 #endif
@@ -38,7 +40,7 @@ and stopped.
 #include "FileUtil.h"
 #include "StringUtil.h"
 #include "DynamicLibrary.h"
-#include "../../../../Branches/MusicMod/Common/Src/Console.h"
+#include "../../../../Branches/MusicMod/Common/Src/Console.h" 
 ///////////////////////////////////
 
 
diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp
index ecc2c644d7..02f9cd7f58 100644
--- a/Source/Core/Common/Src/FileSearch.cpp
+++ b/Source/Core/Common/Src/FileSearch.cpp
@@ -19,6 +19,8 @@
 #ifndef _WIN32
 #include <sys/types.h>
 #include <dirent.h>
+#else
+#include <windows.h>
 #endif
 
 #include <string>
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
index 923a35b249..648d909e79 100644
--- a/Source/Core/Common/Src/FileUtil.cpp
+++ b/Source/Core/Common/Src/FileUtil.cpp
@@ -19,6 +19,7 @@
 #include "FileUtil.h"
 
 #ifdef _WIN32
+#include <windows.h>
 #include <shlobj.h>		// for SHGetFolderPath
 #include <shellapi.h>
 #include <commdlg.h>	// for GetSaveFileName
diff --git a/Source/Core/Common/Src/MappedFile.cpp b/Source/Core/Common/Src/MappedFile.cpp
index f22f10934a..fb211a34b2 100644
--- a/Source/Core/Common/Src/MappedFile.cpp
+++ b/Source/Core/Common/Src/MappedFile.cpp
@@ -15,7 +15,9 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#ifndef _WIN32
+#ifdef _WIN32
+#include <windows.h>
+#else
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp
index 7d9b08f1ba..531660ceda 100644
--- a/Source/Core/Common/Src/MemArena.cpp
+++ b/Source/Core/Common/Src/MemArena.cpp
@@ -18,7 +18,9 @@
 #include "Common.h"
 #include "MemArena.h"
 
-#ifndef _WIN32
+#ifdef _WIN32
+#include <windows.h>
+#else
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/Source/Core/Common/Src/MemArena.h b/Source/Core/Common/Src/MemArena.h
index e175bb0d38..a6651ea8bf 100644
--- a/Source/Core/Common/Src/MemArena.h
+++ b/Source/Core/Common/Src/MemArena.h
@@ -18,6 +18,10 @@
 #ifndef _MEMARENA_H
 #define _MEMARENA_H
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #include "Common.h"
 
 // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp
index 6d5324c776..7dc0d787e4 100644
--- a/Source/Core/Common/Src/MemoryUtil.cpp
+++ b/Source/Core/Common/Src/MemoryUtil.cpp
@@ -18,7 +18,9 @@
 #include "Common.h"
 #include "MemoryUtil.h"
 
-#ifdef __GNUC__
+#ifdef _WIN32
+#include <windows.h>
+#elif __GNUC__
 #include <sys/mman.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
index fa91d9197d..2dbbcf2b69 100644
--- a/Source/Core/Common/Src/Thread.h
+++ b/Source/Core/Common/Src/Thread.h
@@ -19,6 +19,7 @@
 #define _THREAD_H
 
 #ifdef _WIN32
+#include <windows.h>
 #define THREAD_RETURN DWORD WINAPI
 #else
 #define THREAD_RETURN void*
diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp
index 270a339a70..641a28e8ae 100644
--- a/Source/Core/Common/Src/Timer.cpp
+++ b/Source/Core/Common/Src/Timer.cpp
@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #ifdef _WIN32
+#include <windows.h>
 #include <mmsystem.h>
 #endif
 
diff --git a/Source/Core/Core/Src/ARDecrypt.h b/Source/Core/Core/Src/ARDecrypt.h
index e27a19fabf..78ab3b7fa9 100644
--- a/Source/Core/Core/Src/ARDecrypt.h
+++ b/Source/Core/Core/Src/ARDecrypt.h
@@ -17,6 +17,10 @@
 #ifndef _ARDECRYPT_H_
 #define _ARDECRYPT_H_
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index c88a12e773..57e3def809 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -18,7 +18,13 @@
  
 //////////////////////////////////////////////////////////////////////////////////////////
 // Include
-// ŻŻŻŻŻŻŻŻŻŻ
+// 
+#ifdef _WIN32
+#include <windows.h>
+#else
+
+#endif
+
 #include "Thread.h"
 #include "Timer.h"
 #include "Common.h"
@@ -70,7 +76,7 @@ namespace Core
  
 //////////////////////////////////////////////////////////////////////////////////////////
 // Declarations and definitions
-// ŻŻŻŻŻŻŻŻŻŻ
+// 
  
 // Function forwarding
 //void Callback_VideoRequestWindowSize(int _iWidth, int _iHeight, BOOL _bFullscreen);
@@ -108,7 +114,7 @@ Common::Event emuThreadGoing;
  
 //////////////////////////////////////////////////////////////////////////////////////////
 // Display messages and return values
-// ŻŻŻŻŻŻŻŻŻŻ
+// 
 bool PanicAlertToVideo(const char* text, bool yes_no)
 {
 	DisplayMessage(text, 3000);
@@ -151,7 +157,7 @@ bool GetRealWiimote()
  
 //////////////////////////////////////////////////////////////////////////////////////////
 // This is called from the GUI thread. See the booting call schedule in BootManager.cpp
-// ŻŻŻŻŻŻŻŻŻŻ
+// 
 bool Init(const SCoreStartupParameter _CoreParameter)
 {
 	if (g_pThread != NULL) {
@@ -225,7 +231,7 @@ void Stop() // - Hammertime!
  
 //////////////////////////////////////////////////////////////////////////////////////////
 // Create the CPU thread
-// ŻŻŻŻŻŻŻŻŻŻ
+// 
 THREAD_RETURN CpuThread(void *pArg)
 {
     Common::SetCurrentThreadName("CPU thread");
@@ -274,7 +280,7 @@ THREAD_RETURN CpuThread(void *pArg)
  
 //////////////////////////////////////////////////////////////////////////////////////////
 // Initalize plugins and create emulation thread
-// ŻŻŻŻŻŻŻŻŻŻ
+// 
 	/* Call browser: Init():g_pThread(). See the BootManager.cpp file description for a complete
 		call schedule. */
 THREAD_RETURN EmuThread(void *pArg)
@@ -436,7 +442,7 @@ THREAD_RETURN EmuThread(void *pArg)
  
 //////////////////////////////////////////////////////////////////////////////////////////
 // Set or get the running state
-// ŻŻŻŻŻŻŻŻŻŻ
+// 
 bool SetState(EState _State)
 {
 	switch(_State)
@@ -476,7 +482,7 @@ EState GetState()
  
 //////////////////////////////////////////////////////////////////////////////////////////
 // Save or recreate the emulation state
-// ŻŻŻŻŻŻŻŻŻŻ
+// 
 void SaveState() {
     State_Save(0);
 }
diff --git a/Source/Core/Core/Src/HW/CPUCompare.cpp b/Source/Core/Core/Src/HW/CPUCompare.cpp
index a1a1479ac4..d0de2436e2 100644
--- a/Source/Core/Core/Src/HW/CPUCompare.cpp
+++ b/Source/Core/Core/Src/HW/CPUCompare.cpp
@@ -14,6 +14,10 @@
 
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #include "Common.h"
 #include "../Core.h"
 
diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp
index f44bc11805..f424b2c465 100644
--- a/Source/Core/DiscIO/Src/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp
@@ -19,6 +19,7 @@
 
 #ifdef _WIN32
 #include <io.h>
+#include <windows.h>
 #else
 #include <unistd.h>
 #endif
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp
index 4f5001afb8..6188b75798 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp
@@ -21,6 +21,9 @@
 #include <string>
 #include <stdio.h>
 #include "Common.h"
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 #if defined(HAVE_WX) && HAVE_WX
 #include "../Debugger/Debugger.h"
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp
index 0c243230b8..f7ca3b1855 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp
@@ -25,6 +25,7 @@
 #include <iostream>
 #include <vector>
 #include <string> // So that we can test if std::string == abc
+#include <windows.h>
 
 #include "Common.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index b1759fd58f..ed8ada0a09 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include <tchar.h>
+#include <windows.h>
 #include <d3dx9.h>
 
 #include "Common.h"
diff --git a/Source/Plugins/Plugin_Wiimote/Src/Console.cpp b/Source/Plugins/Plugin_Wiimote/Src/Console.cpp
index cc001fe441..458de92d0a 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/Console.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/Console.cpp
@@ -19,9 +19,12 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Includes
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 #include <string>
 #include <stdio.h>
+#ifdef _WIN32
+	#include <windows.h>
+#endif
 
 #include "StringUtil.h"
 
@@ -34,7 +37,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Settings
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻ
+// 
 
 // On and off
 bool g_consoleEnable = true;