From f1a3bc139725a5ae2b7d06083f9a530822915cc8 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Tue, 13 Jan 2009 04:23:26 +0000 Subject: [PATCH] Move #include from all files that include it and common.h to common.h git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1861 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 | 4 +--- 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 | 6 ------ Source/Core/Core/Src/HW/CPUCompare.cpp | 4 ---- Source/Core/Core/Src/HW/CommandProcessor.h | 4 ---- Source/Core/Core/Src/MemTools.cpp | 7 +------ Source/Core/DiscIO/Src/CompressedBlob.cpp | 1 - Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp | 3 --- Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp | 1 - Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 1 - Source/Plugins/Plugin_Wiimote/Src/Console.cpp | 3 --- 21 files changed, 6 insertions(+), 55 deletions(-) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index a0fbeae3ea..09f932e9ff 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -24,6 +24,7 @@ #define CHECK_HEAP_INTEGRITY() #ifdef _WIN32 +#include #ifdef _DEBUG #include #undef CHECK_HEAP_INTEGRITY diff --git a/Source/Core/Common/Src/DriveUtil.cpp b/Source/Core/Common/Src/DriveUtil.cpp index 2d3cc7f8af..660693425f 100644 --- a/Source/Core/Common/Src/DriveUtil.cpp +++ b/Source/Core/Common/Src/DriveUtil.cpp @@ -19,7 +19,6 @@ #include "DriveUtil.h" #ifdef _WIN32 -#include #include #endif diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp index 53da3e21aa..010892c183 100644 --- a/Source/Core/Common/Src/DynamicLibrary.cpp +++ b/Source/Core/Common/Src/DynamicLibrary.cpp @@ -29,9 +29,7 @@ and stopped. // Includes // ŻŻŻŻŻŻŻŻŻŻŻŻŻ #include -#ifdef _WIN32 -#include -#else +#ifndef _WIN32 #include #include #endif diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp index 02f9cd7f58..ecc2c644d7 100644 --- a/Source/Core/Common/Src/FileSearch.cpp +++ b/Source/Core/Common/Src/FileSearch.cpp @@ -19,8 +19,6 @@ #ifndef _WIN32 #include #include -#else -#include #endif #include diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 67717bcaff..3dfdd373c6 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -19,7 +19,6 @@ #include "FileUtil.h" #ifdef _WIN32 -#include #include // for SHGetFolderPath #include #include // for GetSaveFileName diff --git a/Source/Core/Common/Src/MappedFile.cpp b/Source/Core/Common/Src/MappedFile.cpp index fb211a34b2..f22f10934a 100644 --- a/Source/Core/Common/Src/MappedFile.cpp +++ b/Source/Core/Common/Src/MappedFile.cpp @@ -15,9 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifdef _WIN32 -#include -#else +#ifndef _WIN32 #include #include #include diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp index 531660ceda..7d9b08f1ba 100644 --- a/Source/Core/Common/Src/MemArena.cpp +++ b/Source/Core/Common/Src/MemArena.cpp @@ -18,9 +18,7 @@ #include "Common.h" #include "MemArena.h" -#ifdef _WIN32 -#include -#else +#ifndef _WIN32 #include #include #include diff --git a/Source/Core/Common/Src/MemArena.h b/Source/Core/Common/Src/MemArena.h index a6651ea8bf..e175bb0d38 100644 --- a/Source/Core/Common/Src/MemArena.h +++ b/Source/Core/Common/Src/MemArena.h @@ -18,10 +18,6 @@ #ifndef _MEMARENA_H #define _MEMARENA_H -#ifdef _WIN32 -#include -#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 7dc0d787e4..6d5324c776 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -18,9 +18,7 @@ #include "Common.h" #include "MemoryUtil.h" -#ifdef _WIN32 -#include -#elif __GNUC__ +#ifdef __GNUC__ #include #include #include diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h index 2dbbcf2b69..fa91d9197d 100644 --- a/Source/Core/Common/Src/Thread.h +++ b/Source/Core/Common/Src/Thread.h @@ -19,7 +19,6 @@ #define _THREAD_H #ifdef _WIN32 -#include #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 6e59ea0a89..3ecd15b11a 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ #ifdef _WIN32 -#include #include #endif diff --git a/Source/Core/Core/Src/ARDecrypt.h b/Source/Core/Core/Src/ARDecrypt.h index 78ab3b7fa9..e27a19fabf 100644 --- a/Source/Core/Core/Src/ARDecrypt.h +++ b/Source/Core/Core/Src/ARDecrypt.h @@ -17,10 +17,6 @@ #ifndef _ARDECRYPT_H_ #define _ARDECRYPT_H_ -#ifdef _WIN32 -#include -#endif - #include #include #include diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index a447d5df31..f880a781b8 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -19,12 +19,6 @@ ////////////////////////////////////////////////////////////////////////////////////////// // Include // ŻŻŻŻŻŻŻŻŻŻ -#ifdef _WIN32 -#include -#else - -#endif - #include "Thread.h" #include "Timer.h" #include "Common.h" diff --git a/Source/Core/Core/Src/HW/CPUCompare.cpp b/Source/Core/Core/Src/HW/CPUCompare.cpp index d0de2436e2..a1a1479ac4 100644 --- a/Source/Core/Core/Src/HW/CPUCompare.cpp +++ b/Source/Core/Core/Src/HW/CPUCompare.cpp @@ -14,10 +14,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifdef _WIN32 -#include -#endif - #include "Common.h" #include "../Core.h" diff --git a/Source/Core/Core/Src/HW/CommandProcessor.h b/Source/Core/Core/Src/HW/CommandProcessor.h index dddb376972..312abe9774 100644 --- a/Source/Core/Core/Src/HW/CommandProcessor.h +++ b/Source/Core/Core/Src/HW/CommandProcessor.h @@ -22,10 +22,6 @@ #include "pluginspecs_video.h" class PointerWrap; -#ifdef _WIN32 -#include -#endif - extern bool MT; namespace CommandProcessor { diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/MemTools.cpp index c46f76b88c..2e93cb308b 100644 --- a/Source/Core/Core/Src/MemTools.cpp +++ b/Source/Core/Core/Src/MemTools.cpp @@ -16,12 +16,7 @@ // http://code.google.com/p/dolphin-emu/ -#ifdef _WIN32 - -#include - -#else - +#ifndef _WIN32 #include #include #include diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp index f424b2c465..f44bc11805 100644 --- a/Source/Core/DiscIO/Src/CompressedBlob.cpp +++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp @@ -19,7 +19,6 @@ #ifdef _WIN32 #include -#include #else #include #endif diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp index 6188b75798..4f5001afb8 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp @@ -21,9 +21,6 @@ #include #include #include "Common.h" -#ifdef _WIN32 -#include -#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 f7ca3b1855..0c243230b8 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp @@ -25,7 +25,6 @@ #include #include #include // So that we can test if std::string == abc -#include #include "Common.h" diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index ba134e4777..409241760c 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ #include -#include #include #include "Common.h" diff --git a/Source/Plugins/Plugin_Wiimote/Src/Console.cpp b/Source/Plugins/Plugin_Wiimote/Src/Console.cpp index 438738b80d..cc001fe441 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/Console.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/Console.cpp @@ -22,9 +22,6 @@ // ŻŻŻŻŻŻŻŻŻŻŻŻŻ #include #include -#ifdef _WIN32 - #include -#endif #include "StringUtil.h"