[Scummvm-cvs-logs] SF.net SVN: scummvm: [32347] scummvm/trunk/base/plugins.h

[thebluegr at users.sourceforge.net]

Revision: 32347
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32347&view=rev
Author:   thebluegr
Date:     2008-05-28 12:45:04 -0700 (Wed, 28 May 2008)

Log Message:
-----------
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...

Modified Paths:
--------------
    scummvm/trunk/base/plugins.h

Modified: scummvm/trunk/base/plugins.h
===================================================================
--- scummvm/trunk/base/plugins.h	2008-05-28 19:30:43 UTC (rev 32346)
+++ scummvm/trunk/base/plugins.h	2008-05-28 19:45:04 UTC (rev 32347)
@@ -82,16 +82,10 @@
 #define DYNAMIC_PLUGIN 2
 
 #define PLUGIN_ENABLED_STATIC(ID) \
-	(defined(ENABLE_##ID) && !PLUGIN_ENABLED_DYNAMIC(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
-
 #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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.