remove remnants of the old plugin api from dissectors and plugins

svn path=/trunk/; revision=13656

5 files changed, 9 insertions, 56 deletions

diff --git a/epan/dissectors/packet-pn-rt.c b/epan/dissectors/packet-pn-rt.c
index 551c736a50..a71958b861 100644
--- a/epan/dissectors/packet-pn-rt.c
+++ b/epan/dissectors/packet-pn-rt.c
@@ -28,15 +28,6 @@
 #include "config.h"
 #endif
 
-/* we do not use this dissector as a plugin any longer... */
-#define __ETHEREAL_STATIC__
-
-#ifndef __ETHEREAL_STATIC__
-#include "plugins/plugin_api.h"
-#include "moduleinfo.h"
-#endif
-
-
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -57,13 +48,6 @@
 #include <epan/strutil.h>
 #include <etypes.h>
 
-
-#ifndef __ETHEREAL_STATIC__
-#include "plugins/plugin_api_defs.h"
-
-G_MODULE_EXPORT const gchar version[] = VERSION;
-#endif
-
 void proto_reg_handoff_pn_rt(void);
 
 /* Define the pn-rt proto */
@@ -426,32 +410,3 @@ proto_reg_handoff_pn_rt(void)
   data_handle = find_dissector("data");
 }
 
-
-
-
-/* Start the functions we need for the plugin stuff */
-
-#ifndef __ETHEREAL_STATIC__
-
-G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_pn_rt();
-}
-
-G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
-  /* register the new protocol, protocol fields, and subtrees */
-  if (proto_pn_rt == -1) { /* execute protocol initialization only once */
-    proto_register_pn_rt();
-  }
-}
-
-#endif /* __ETHEREAL_STATIC__ */
-
-/* End the functions we need for plugin stuff */
diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h
index 0a759addbd..266d57b890 100644
--- a/plugins/mate/mate.h
+++ b/plugins/mate/mate.h
@@ -33,7 +33,6 @@
 #endif
 
 #ifndef ENABLE_STATIC
-#include "plugins/plugin_api.h"
 #include "moduleinfo.h"
 #include <gmodule.h>
 #else 
@@ -54,8 +53,6 @@
 #include <epan/report_err.h>
 
 #include "mate_util.h"
-#include "plugins/plugin_api_defs.h"
-
 
 /* defaults */
 
diff --git a/plugins/mate/mate_plugin.c b/plugins/mate/mate_plugin.c
index 963e9b75ee..4111c76c29 100644
--- a/plugins/mate/mate_plugin.c
+++ b/plugins/mate/mate_plugin.c
@@ -30,11 +30,12 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
+#include <glib.h>
+
+#ifndef ENABLE_STATIC
 #include "moduleinfo.h"
 #include <gmodule.h>
-#include "plugins/plugin_api_defs.h"
-
+#endif
 
 /* these two are in packet-mate.c */
 void proto_register_mate(void);
diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c
index 3621df24b2..dccb029a50 100644
--- a/plugins/stats_tree/stats_tree_plugin.c
+++ b/plugins/stats_tree/stats_tree_plugin.c
@@ -28,9 +28,8 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
 #include <gmodule.h>
-#include "plugins/plugin_api_defs.h"
+
 #include <epan/stats_tree.h>
 
 extern void register_pinfo_stat_trees(void);
diff --git a/plugins/xml/xml_plugin.c b/plugins/xml/xml_plugin.c
index 6c49f1d066..9727e02769 100644
--- a/plugins/xml/xml_plugin.c
+++ b/plugins/xml/xml_plugin.c
@@ -29,11 +29,12 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
+#include <glib.h>
+
+#ifndef ENABLE_STATIC
 #include "moduleinfo.h"
 #include <gmodule.h>
-#include "plugins/plugin_api_defs.h"
-
+#endif
 
 /* these two are in packet-mate.c */
 void proto_register_xml(void);