diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-22 10:41:27 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-22 10:41:27 +0000 |
| commit | 0f8572cb514ecd0aa8214aaf40fb98f1dd26209a (patch) | |
| tree | d6d13c2a85045f79a3b2ec4054f433a82b18de42 /epan/epan.h | |
| parent | fc7a77189d31a6b35175cee4c01f8e253da7e774 (diff) | |
Avoid including definition of column_info structure in dissectors.
Move COL_* enum to <epan/column-utils.h>
XXX Later we can rename epan/column-info.h to column-int.h (or smth like this)
svn path=/trunk/; revision=54352
Diffstat (limited to 'epan/epan.h')
| -rw-r--r-- | epan/epan.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/epan.h b/epan/epan.h index ca3432b550..093f7f8562 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -30,13 +30,13 @@ extern "C" { #include <glib.h> #include "frame_data.h" -#include "column-info.h" #include "register.h" #include "ws_symbol_export.h" typedef struct epan_dissect epan_dissect_t; struct epan_dfilter; +struct epan_column_info; /** @mainpage Wireshark EPAN the packet analyzing engine. Source code can be found in the epan directory @@ -170,12 +170,12 @@ epan_dissect_fake_protocols(epan_dissect_t *edt, const gboolean fake_protocols); WS_DLL_PUBLIC void epan_dissect_run(epan_dissect_t *edt, struct wtap_pkthdr *phdr, - tvbuff_t *tvb, frame_data *fd, column_info *cinfo); + tvbuff_t *tvb, frame_data *fd, struct epan_column_info *cinfo); WS_DLL_PUBLIC void epan_dissect_run_with_taps(epan_dissect_t *edt, struct wtap_pkthdr *phdr, - tvbuff_t *tvb, frame_data *fd, column_info *cinfo); + tvbuff_t *tvb, frame_data *fd, struct epan_column_info *cinfo); /** Prime a proto_tree using the fields/protocols used in a dfilter. */ WS_DLL_PUBLIC |