diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-10-18 21:14:43 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-10-18 21:14:43 +0000 |
| commit | 576b24c96ee4ac4ca7fb9fc116b6e8ce3704227d (patch) | |
| tree | f8e0abf64215eb0083a475acfdcea3806e4c0ba5 /epan/tap.h | |
| parent | 05c1e47f68b609702ec13a09e5ebc1a572841e12 (diff) | |
| download | wireshark-576b24c96ee4ac4ca7fb9fc116b6e8ce3704227d.tar.gz | |
Move ui-independent object export routines to the common ui directory.
Implement DICOM, HTTP, and SMB object exports. Rename the GTK+ export
files. C++-ize epan/tap.h. Fix an apparent memory leak in
eo_save_all_clicked_cb.
The Qt dialog has an indeterminate progress bar. I tried adding
something similar to the GTK+ dialog but event processing led down a
rabbit hole.
svn path=/trunk/; revision=45647
Diffstat (limited to 'epan/tap.h')
| -rw-r--r-- | epan/tap.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/epan/tap.h b/epan/tap.h index 22d0fcd9ea..6c1b95ea11 100644 --- a/epan/tap.h +++ b/epan/tap.h @@ -22,11 +22,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _TAP_H_ -#define _TAP_H_ +#ifndef __TAP_H__ +#define __TAP_H__ #include <epan/epan.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + typedef void (*tap_reset_cb)(void *tapdata); typedef gboolean (*tap_packet_cb)(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data); typedef void (*tap_draw_cb)(void *tapdata); @@ -61,4 +65,8 @@ extern gboolean have_filtering_tap_listeners(void); extern guint union_of_tap_listener_flags(void); extern const void *fetch_tapped_data(int tap_id, int idx); -#endif +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __TAP_H__ */ |