forked from osmocom/wireshark
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
This commit is contained in:
parent
25ce6c262e
commit
5fa7d37e37
|
@ -85,8 +85,10 @@ epan_get_version(void) {
|
|||
void
|
||||
epan_register_plugin_types(void)
|
||||
{
|
||||
#ifdef HAVE_PLUGINS
|
||||
register_dissector_plugin_type();
|
||||
register_tap_plugin_type();
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
#ifndef __TAP_H__
|
||||
#define __TAP_H__
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <epan/epan.h>
|
||||
#include "ws_symbol_export.h"
|
||||
|
||||
|
@ -46,9 +48,11 @@ typedef void (*tap_draw_cb)(void *tapdata);
|
|||
#define TL_IS_DISSECTOR_HELPER 0x00000004 /**< tap helps a dissector do work
|
||||
** but does not, itself, require dissection */
|
||||
|
||||
#ifdef HAVE_PLUGINS
|
||||
/** Register tap plugin type with the plugin system.
|
||||
Called by epan_register_plugin_types(); do not call it yourself. */
|
||||
extern void register_tap_plugin_type(void);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* For all tap plugins, call their register routines.
|
||||
|
|
Loading…
Reference in New Issue