space changes, merge #defines, language fix, and code reorder/cleanup :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5614 8ced0084-cf51-0410-be5f-012b33b47a6e

4 files changed, 16 insertions, 21 deletions

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index aa2f01b662..80bd3d75e8 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -27,12 +27,7 @@
 
 // Force enable logging in the right modes. For some reason, something had changed
 // so that debugfast no longer logged.
-#ifdef _DEBUG
-#undef LOGGING
-#define LOGGING 1
-#endif
-
-#ifdef DEBUGFAST
+#if defined(_DEBUG) || defined(DEBUGFAST)
 #undef LOGGING
 #define LOGGING 1
 #endif
@@ -137,7 +132,7 @@
 // A macro to disallow the copy constructor and operator= functions
 // This should be used in the private: declarations for a class
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&);               \
-  void operator=(const TypeName&)
+	TypeName(const TypeName&);               \
+	void operator=(const TypeName&)
 
 #endif // _COMMON_H_
diff --git a/Source/Core/Common/Src/DynamicLibrary.h b/Source/Core/Common/Src/DynamicLibrary.h
index 11ea225340..b48783ce37 100644
--- a/Source/Core/Common/Src/DynamicLibrary.h
+++ b/Source/Core/Common/Src/DynamicLibrary.h
@@ -38,10 +38,10 @@ public:
 	int Unload();
 
 	// Gets a pointer to the function symbol of funcname by getting it from the
-	// share object
+	// shared object
 	void *Get(const char *funcname) const;
 
-	// Returns true is the library is loaded
+	// Returns true if the library is loaded
 	bool IsLoaded() const { return library != 0; }
 
 private:
diff --git a/Source/Core/Common/Src/Plugin.cpp b/Source/Core/Common/Src/Plugin.cpp
index 8cadbdbad6..b4e3a4262a 100644
--- a/Source/Core/Common/Src/Plugin.cpp
+++ b/Source/Core/Common/Src/Plugin.cpp
@@ -43,7 +43,7 @@ CPlugin::CPlugin(const char* _szName) : valid(false)
 	m_EmuStateChange = NULL;
 		
 	if (m_hInstLib.Load(_szName))
-	{        
+	{
 		m_GetDllInfo = reinterpret_cast<TGetDllInfo>
 			(m_hInstLib.Get("GetDllInfo"));
 		m_DllConfig = reinterpret_cast<TDllConfig>
@@ -61,7 +61,7 @@ CPlugin::CPlugin(const char* _szName) : valid(false)
 		m_EmuStateChange = reinterpret_cast<TEmuStateChange>
 			(m_hInstLib.Get("EmuStateChange"));
 		
-		// Check if the plugin has all the functions it shold have
+		// Check if the plugin has all the functions it should have
 		if (m_GetDllInfo != 0 &&
 			m_DllConfig != 0 &&
 			m_DllDebugger != 0 &&
@@ -88,7 +88,7 @@ bool CPlugin::GetInfo(PLUGIN_INFO& _pluginInfo)
 	if (m_GetDllInfo != NULL) {
 		m_GetDllInfo(&_pluginInfo);
 		return true;
-	}    
+	}
 	return false;
 }
 
diff --git a/Source/Core/Common/Src/Plugin.h b/Source/Core/Common/Src/Plugin.h
index 5d91bb0c49..97c8b981ad 100644
--- a/Source/Core/Common/Src/Plugin.h
+++ b/Source/Core/Common/Src/Plugin.h
@@ -24,14 +24,14 @@
 
 namespace Common
 {
-    typedef void (__cdecl * TGetDllInfo)(PLUGIN_INFO*);
-    typedef void (__cdecl * TDllConfig)(HWND);
-    typedef void (__cdecl * TDllDebugger)(HWND, bool);
-    typedef void (__cdecl * TSetDllGlobals)(PLUGIN_GLOBALS*);
-    typedef void (__cdecl * TInitialize)(void *);
-    typedef void (__cdecl * TShutdown)();
-    typedef void (__cdecl * TDoState)(unsigned char**, int);
-    typedef void (__cdecl * TEmuStateChange)(PLUGIN_EMUSTATE);
+	typedef void (__cdecl * TGetDllInfo)(PLUGIN_INFO*);
+	typedef void (__cdecl * TDllConfig)(HWND);
+	typedef void (__cdecl * TDllDebugger)(HWND, bool);
+	typedef void (__cdecl * TSetDllGlobals)(PLUGIN_GLOBALS*);
+	typedef void (__cdecl * TInitialize)(void *);
+	typedef void (__cdecl * TShutdown)();
+	typedef void (__cdecl * TDoState)(unsigned char**, int);
+	typedef void (__cdecl * TEmuStateChange)(PLUGIN_EMUSTATE);
 
 class CPlugin
 {