aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.h
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-12-10 19:13:09 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-12-10 19:13:09 +0000
commit5fa7d37e377abb89e317f4ebd47ebea69ebe0fd9 (patch)
tree2e782fc004f10f9191800efe801922ce556f49db /epan/proto.h
parent25ce6c262edc7348ec1057f929630e6862eff47d (diff)
Fix epan building with undefined HAVE_PLUGINS
+ guard prototypes with HAVE_PLUGINS in .h files to get errors before linking. svn path=/trunk/; revision=53909
Diffstat (limited to 'epan/proto.h')
-rw-r--r--epan/proto.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/proto.h b/epan/proto.h
index f840403972..b6a091dab7 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -37,6 +37,8 @@
#ifndef __PROTO_H__
#define __PROTO_H__
+#include "config.h"
+
#ifdef HAVE_STDARG_H
# include <stdarg.h>
#else
@@ -612,9 +614,11 @@ WS_DLL_PUBLIC void proto_tree_children_foreach(proto_tree *tree,
/** Retrieve the wmem_allocator_t from a proto_node */
#define PNODE_POOL(proto_node) ((proto_node)->tree_data->pinfo->pool)
+#ifdef HAVE_PLUGINS
/** Register dissector plugin type with the plugin system.
Called by epan_register_plugin_types(); do not call it yourself. */
extern void register_dissector_plugin_type(void);
+#endif
/** Sets up memory used by proto routines. Called at program startup */
void proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_data),