Fix Missing -z proto,colinfo,ip,gtp.teid_cp and -z proto,colinfo,ip,gtp.teid_data

[obnox/wireshark/wip.git] / epan / tap.h

diff --git a/epan/tap.h b/epan/tap.h
index a08b39a0e19c59975e0fcbb313a1e72c46db2fa7..30dfffb9f94035d063fc6232c93b9a7bdc1b2c6a 100644 (file)
--- a/epan/tap.h
+++ b/epan/tap.h
@@ -27,10 +27,14 @@
 
 #include "epan/epan.h"
 
+#ifdef INTTYPES_H_DEFINES_FORMATS
+#include <inttypes.h>
+#endif
+
 /* With MSVC and a libwireshark.dll, we need a 
  * special declaration of num_tap_filters.
  */
-ETH_VAR_IMPORT int num_tap_filters;
+WS_VAR_IMPORT int num_tap_filters;
 
 typedef void (*tap_reset_cb)(void *tapdata);
 typedef int  (*tap_packet_cb)(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data);
@@ -50,6 +54,7 @@ extern GString *register_tap_listener(const char *tapname, void *tapdata,
     tap_draw_cb tap_draw);
 extern void remove_tap_listener(void *tapdata);
 extern gboolean have_tap_listeners(void);
-extern void *fetch_tapped_data(int tap_id, int idx);
+extern gboolean have_tap_listener(int tap_id);
+extern const void *fetch_tapped_data(int tap_id, int idx);
 
 #endif