From 62d8126df0ec90a9b1f3b660fce769631c57208e Mon Sep 17 00:00:00 2001
From: Tony Puccinelli
Date: Fri, 13 Aug 2010 02:58:52 +0000
Subject: added appropriate ifdefs throughout the plugins directory

svn-id: r52053
---
 backends/plugins/arm-loader.h             | 4 ++++
 backends/plugins/ds/ds-provider.h         | 4 +++-
 backends/plugins/elf-loader.h             | 4 ++++
 backends/plugins/elf-provider.h           | 8 ++++----
 backends/plugins/mips-loader.h            | 4 ++++
 backends/plugins/ps2/ps2-provider.h       | 4 ++++
 backends/plugins/psp/psp-provider.h       | 8 ++++----
 backends/plugins/shorts-segment-manager.h | 4 ++++
 8 files changed, 31 insertions(+), 9 deletions(-)

(limited to 'backends/plugins')

diff --git a/backends/plugins/arm-loader.h b/backends/plugins/arm-loader.h
index 7f7a1f7f4b..d377912bbe 100644
--- a/backends/plugins/arm-loader.h
+++ b/backends/plugins/arm-loader.h
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(ARM_TARGET)
+
 #include "backends/fs/ds/ds-fs.h"
 #include "elf-loader.h"
 #include "dsmain.h"
@@ -35,3 +37,5 @@ protected:
 public:
     ARMDLObject() : DLObject() {}
 };
+
+#endif /* defined(DYNAMIC_MODULES) && defined(ARM_TARGET) */
diff --git a/backends/plugins/ds/ds-provider.h b/backends/plugins/ds/ds-provider.h
index 462c3e3b63..2a3e731d1c 100644
--- a/backends/plugins/ds/ds-provider.h
+++ b/backends/plugins/ds/ds-provider.h
@@ -23,10 +23,12 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(__DS__)
+
 #include "backends/plugins/elf-provider.h"
 
 class DSPluginProvider : public ELFPluginProvider {
 	Plugin* createPlugin(const Common::FSNode &node) const;
 };
 
-
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
diff --git a/backends/plugins/elf-loader.h b/backends/plugins/elf-loader.h
index 1d30aa0c3b..4b5ec99b57 100644
--- a/backends/plugins/elf-loader.h
+++ b/backends/plugins/elf-loader.h
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+
 #ifndef ELF_LOADER_H
 #define ELF_LOADER_H
 
@@ -65,3 +67,5 @@ public:
 };
 
 #endif /* ELF_LOADER_H */
+
+#endif /* defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET) */
diff --git a/backends/plugins/elf-provider.h b/backends/plugins/elf-provider.h
index e0382c3e45..61112e5b4e 100644
--- a/backends/plugins/elf-provider.h
+++ b/backends/plugins/elf-provider.h
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+
 #ifndef BACKENDS_PLUGINS_ELF_PROVIDER_H
 #define BACKENDS_PLUGINS_ELF_PROVIDER_H
 
@@ -32,8 +34,6 @@
 
 #include "backends/plugins/elf-loader.h"
 
-#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
-
 class ELFPlugin : public DynamicPlugin {
 protected:
 	DLObject *_dlHandle;
@@ -65,6 +65,6 @@ protected:
 
 };
 
-#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
-
 #endif /* BACKENDS_PLUGINS_ELF_PROVIDER_H */
+
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
diff --git a/backends/plugins/mips-loader.h b/backends/plugins/mips-loader.h
index eb22e368f4..0b66412485 100644
--- a/backends/plugins/mips-loader.h
+++ b/backends/plugins/mips-loader.h
@@ -24,6 +24,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(MIPS_TARGET)
+
 #include "elf-loader.h"
 #include "shorts-segment-manager.h"
 
@@ -44,3 +46,5 @@ public:
 		_gpVal = 0;
     }
 };
+
+#endif /* defined(DYNAMIC_MODULES) && defined(MIPS_TARGET) */
diff --git a/backends/plugins/ps2/ps2-provider.h b/backends/plugins/ps2/ps2-provider.h
index 28a2321c29..4833b9a281 100644
--- a/backends/plugins/ps2/ps2-provider.h
+++ b/backends/plugins/ps2/ps2-provider.h
@@ -23,9 +23,13 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__)
+
 #include "backends/plugins/elf-provider.h"
 
 class PS2PluginProvider : public ELFPluginProvider {
 	Plugin* createPlugin(const Common::FSNode &node) const;
 };
 
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+
diff --git a/backends/plugins/psp/psp-provider.h b/backends/plugins/psp/psp-provider.h
index c4debc7997..4662f875b7 100644
--- a/backends/plugins/psp/psp-provider.h
+++ b/backends/plugins/psp/psp-provider.h
@@ -23,17 +23,17 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(__PSP__)
+
 #ifndef BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H
 #define BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H
 
 #include "backends/plugins/elf-provider.h"
 
-#if defined(DYNAMIC_MODULES) && defined(__PSP__)
-
 class PSPPluginProvider : public ELFPluginProvider {
 	Plugin* createPlugin(const Common::FSNode &node) const;
 };
 
-#endif // defined(DYNAMIC_MODULES) && defined(__PSP__)
-
 #endif /* BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H */
+
+#endif // defined(DYNAMIC_MODULES) && defined(__PSP__)
diff --git a/backends/plugins/shorts-segment-manager.h b/backends/plugins/shorts-segment-manager.h
index 54a13d88e1..caefc7da8c 100644
--- a/backends/plugins/shorts-segment-manager.h
+++ b/backends/plugins/shorts-segment-manager.h
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(MIPS_TARGET)
+
 #ifndef SHORTS_SEGMENT_MANAGER_H
 #define SHORTS_SEGMENT_MANAGER_H
 
@@ -87,3 +89,5 @@ private:
 };
 
 #endif /* SHORTS_SEGMENT_MANAGER_H */
+
+#endif /* defined(DYNAMIC_MODULES) && defined(MIPS_TARGET) */
-- 
cgit v1.2.3