From 7ce5e5d1bd0282d40d7b79f12018cb178051643c Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Sat, 26 Jun 2010 13:11:34 +0000
Subject: [PATCH] Config.h should never be included directly, but rather
 through Common.h for portability.

(It is a bit unfortunate that some of the plugins have a Config.h of
their own, which can confuse this matter.)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5795 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/AudioCommon/Src/OpenALStream.h    | 2 +-
 Source/Core/AudioCommon/Src/aldlist.cpp       | 2 +-
 Source/Core/Common/Src/CommonPaths.h          | 4 +---
 Source/Core/DolphinWX/Src/HotkeyDlg.h         | 4 +---
 Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h
index 1b56b2d6c1..e2b5598344 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.h
+++ b/Source/Core/AudioCommon/Src/OpenALStream.h
@@ -18,7 +18,7 @@
 #ifndef _OPENALSTREAM_H_
 #define _OPENALSTREAM_H_
 
-#include <Common.h>
+#include "Common.h"
 #include "SoundStream.h"
 #include "Thread.h"
 
diff --git a/Source/Core/AudioCommon/Src/aldlist.cpp b/Source/Core/AudioCommon/Src/aldlist.cpp
index 7c7ce48318..5e2ce0d7c4 100644
--- a/Source/Core/AudioCommon/Src/aldlist.cpp
+++ b/Source/Core/AudioCommon/Src/aldlist.cpp
@@ -22,7 +22,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Common.h>
+#include "Common.h"
 #include "aldlist.h"
 #ifdef _WIN32
 #include "../../../../Externals/OpenAL/include/al.h"
diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h
index 5adff7038e..7d6d95a0ac 100644
--- a/Source/Core/Common/Src/CommonPaths.h
+++ b/Source/Core/Common/Src/CommonPaths.h
@@ -18,9 +18,7 @@
 #ifndef _COMMON_PATHS_H_
 #define _COMMON_PATHS_H_
 
-#ifdef __linux__
-#include "Config.h"
-#endif
+#include "Common.h"
 
 // Library suffix/prefix
 #ifdef _WIN32
diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.h b/Source/Core/DolphinWX/Src/HotkeyDlg.h
index dedfe45387..47c0c35efc 100644
--- a/Source/Core/DolphinWX/Src/HotkeyDlg.h
+++ b/Source/Core/DolphinWX/Src/HotkeyDlg.h
@@ -25,10 +25,8 @@
 #include <wx/combobox.h>
 #include <wx/checkbox.h>
 #include <wx/gbsizer.h>
-#ifndef _WIN32
-#include "Config.h"
-#endif
 
+#include "Common.h"
 #include "CoreParameter.h"
 #include "WXInputBase.h"
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h b/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
index 98ef9164b5..0cb3ddf943 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
@@ -21,7 +21,6 @@
 #include <vector>
 #include "Common.h"
 #include "Globals.h"
-#include "Config.h"
 #include "pluginspecs_video.h"
 
 #ifdef _WIN32