aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorLars Roland <Lars.Roland@gmx.net>2005-03-07 21:40:29 +0000
committerLars Roland <Lars.Roland@gmx.net>2005-03-07 21:40:29 +0000
commit9a1a7629226f6072faf6193a9e9a5e975c39ca2d (patch)
tree79468b3d1ce5fe109034ad43d224f6a175de40cc /plugins
parent466603ba82f2fa1683758d3a16e813fc14d48de5 (diff)
remove remnants of the old plugin api from dissectors and plugins
svn path=/trunk/; revision=13656
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mate/mate.h3
-rw-r--r--plugins/mate/mate_plugin.c7
-rw-r--r--plugins/stats_tree/stats_tree_plugin.c3
-rw-r--r--plugins/xml/xml_plugin.c7
4 files changed, 9 insertions, 11 deletions
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);