diff options
| author | Tony Puccinelli | 2010-06-05 01:05:19 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-06-05 01:05:19 +0000 |
| commit | 95e56f2052956e80a6319b2916a8f899340effaf (patch) | |
| tree | f9525eb32e05f1a4746233fe3daf254d07cb83ab /backends/plugins/ps2 | |
| parent | 28e28a2fea9f6adf4967463024c609e6a01ac5b0 (diff) | |
| parent | 3a5fe4ca002a85f7c4549c8d36203553553c53f9 (diff) | |
| download | scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.tar.gz scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.tar.bz2 scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.zip | |
merged trunk into branch and corrected __PS2__ to __PLAYSTATION2__ in a couple files
svn-id: r49435
Diffstat (limited to 'backends/plugins/ps2')
| -rw-r--r-- | backends/plugins/ps2/ps2-provider.cpp | 4 | ||||
| -rw-r--r-- | backends/plugins/ps2/ps2-provider.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/backends/plugins/ps2/ps2-provider.cpp b/backends/plugins/ps2/ps2-provider.cpp index 2676c56ae8..3e966bbd08 100644 --- a/backends/plugins/ps2/ps2-provider.cpp +++ b/backends/plugins/ps2/ps2-provider.cpp @@ -23,7 +23,7 @@ * */ -#if defined(DYNAMIC_MODULES) && defined(__PS2__) +#if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__) #include "backends/plugins/ps2/ps2-provider.h" #include "backends/plugins/dynamic-plugin.h" @@ -105,4 +105,4 @@ bool PS2PluginProvider::isPluginFilename(const Common::FSNode &node) const { return true; } -#endif // defined(DYNAMIC_MODULES) && defined(__PS2__) +#endif // defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__) diff --git a/backends/plugins/ps2/ps2-provider.h b/backends/plugins/ps2/ps2-provider.h index 3c6550776b..6a357db63d 100644 --- a/backends/plugins/ps2/ps2-provider.h +++ b/backends/plugins/ps2/ps2-provider.h @@ -28,7 +28,7 @@ #include "base/plugins.h" -#if defined(DYNAMIC_MODULES) && defined(__PS2__) +#if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__) class PS2PluginProvider : public FilePluginProvider { protected: @@ -38,6 +38,6 @@ protected: }; -#endif // defined(DYNAMIC_MODULES) && defined(__PS2__) +#endif // defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__) #endif /* BACKENDS_PLUGINS_PS2_PS2_PROVIDER_H */ |