Removed the DENG_PLUGIN_GLOBAL macro

With -rdynamic gone, this is no longer necessary.
skyjake · Jan 5, 2013 · 03551ba · 03551ba
1 parent 5639cea
commit 03551ba
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/doomsday/engine/api/api_plugin.h b/doomsday/engine/api/api_plugin.h
@@ -37,14 +37,8 @@ extern "C" {
 
 #define LIBDENG_PLUGINDESC      "(" DOOMSDAY_NICENAME " Plugin)"
 
-/**
- * Use this for all global variables in plugins so that they will not be
- * confused with engine's exported symbols.
- */
-#define DENG_PLUGIN_GLOBAL(name)    __DengPlugin_##name
-
-#define MAX_HOOKS           16
-#define HOOKF_EXCLUSIVE     0x01000000
+#define MAX_HOOKS               16
+#define HOOKF_EXCLUSIVE         0x01000000
 
 typedef int     (*pluginfunc_t) (void);
 typedef int     (*hookfunc_t) (int type, int parm, void *data);

diff --git a/doomsday/plugins/wadmapconverter/include/wadmapconverter.h b/doomsday/plugins/wadmapconverter/include/wadmapconverter.h
@@ -29,7 +29,7 @@
 #include "doomsday.h"
 #include "id1map.h"
 
-extern Id1Map* DENG_PLUGIN_GLOBAL(map);
+extern Id1Map* map;
 
 DENG_USING_API(Base);
 DENG_USING_API(Material);

diff --git a/doomsday/plugins/wadmapconverter/src/id1map_load.cpp b/doomsday/plugins/wadmapconverter/src/id1map_load.cpp
@@ -24,8 +24,6 @@
 #include "wadmapconverter.h"
 #include <de/libdeng2.h>
 
-#define map                     DENG_PLUGIN_GLOBAL(map)
-
 size_t ElementSizeForMapLumpType(MapFormatId mapFormat, MapLumpType type)
 {
     switch(type)

diff --git a/doomsday/plugins/wadmapconverter/src/wadmapconverter.cpp b/doomsday/plugins/wadmapconverter/src/wadmapconverter.cpp
@@ -25,7 +25,6 @@
 #include <de/Error>
 #include <de/Log>
 
-#define map                     DENG_PLUGIN_GLOBAL(map)
 Id1Map* map;
 
 /**