diff options
| author | Filippos Karapetis | 2008-05-28 19:45:04 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-05-28 19:45:04 +0000 |
| commit | 057af1000f5187a93fc1ac1a5f61a7a6a382bf03 (patch) | |
| tree | 30536d46cca41c9f7f8c7800d3249e6df96816c9 | |
| parent | 649f439fb6fe7099ed4cf589961e6391d6ed45c5 (diff) | |
| download | scummvm-rg350-057af1000f5187a93fc1ac1a5f61a7a6a382bf03.tar.gz scummvm-rg350-057af1000f5187a93fc1ac1a5f61a7a6a382bf03.tar.bz2 scummvm-rg350-057af1000f5187a93fc1ac1a5f61a7a6a382bf03.zip | |
Removed an MSVC specific hack, after discussing with jvprat. It seems that MSVC was trying to add the parenthesis after ENABLE_##ID to the check...
svn-id: r32347
| -rw-r--r-- | base/plugins.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/base/plugins.h b/base/plugins.h index 7507e0c358..2eaa290ed7 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -82,16 +82,10 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX]; #define DYNAMIC_PLUGIN 2 #define PLUGIN_ENABLED_STATIC(ID) \ - (defined(ENABLE_##ID) && !PLUGIN_ENABLED_DYNAMIC(ID)) - -// HACK for MSVC -#if defined(_MSC_VER) - #undef PLUGIN_ENABLED_STATIC - #define PLUGIN_ENABLED_STATIC(ID) 1 -#endif + (defined( ENABLE_##ID ) && !PLUGIN_ENABLED_DYNAMIC(ID)) #define PLUGIN_ENABLED_DYNAMIC(ID) \ - (defined(ENABLE_##ID) && (ENABLE_##ID == DYNAMIC_PLUGIN) && defined(DYNAMIC_MODULES)) + (defined( ENABLE_##ID ) && (ENABLE_##ID == DYNAMIC_PLUGIN) && defined(DYNAMIC_MODULES)) /** * REGISTER_PLUGIN_STATIC is a convenience macro which is used to declare |