diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-02 20:01:12 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-03 04:01:39 +0000 |
| commit | 8363733e303be2ac1c34c76c85b5c1b705c747fc (patch) | |
| tree | aeb29d500d20990e52490d98ffd916d6c6c0bde5 | |
| parent | d4f7f21b51532c1a45a43764fa92cd55e17931de (diff) | |
If you want struct e_in6_addr, include <epan/ipv6-utils.h>.
Don't just define it yourself.
(And especially don't define it yourself if you're already including
epan/ipv6-utils.h.)
Change-Id: I9970d0edecef0c820b2a7fdce34509b54e7b3106
Reviewed-on: https://code.wireshark.org/review/13020
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/addr_resolv.h | 1 | ||||
| -rw-r--r-- | epan/to_str.h | 3 | ||||
| -rw-r--r-- | epan/tvbuff.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 28a03f873f..69ecbb8796 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -180,7 +180,6 @@ WS_DLL_PUBLIC gboolean host_name_lookup_process(void); WS_DLL_PUBLIC const gchar *get_hostname(const guint addr); /* get_hostname6 returns the host name, or numeric addr if not found */ -struct e_in6_addr; WS_DLL_PUBLIC const gchar* get_hostname6(const struct e_in6_addr *ad); /* get_ether_name returns the logical name if found in ethers files else diff --git a/epan/to_str.h b/epan/to_str.h index 52f96cf4da..801bc9f11c 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -28,6 +28,7 @@ #include "wsutil/nstime.h" #include "time_fmt.h" #include <epan/packet_info.h> +#include <epan/ipv6-utils.h> #include "ws_symbol_export.h" #include "wmem/wmem.h" @@ -49,8 +50,6 @@ extern "C" { * but for which no more specific module applies. */ -struct e_in6_addr; - WS_DLL_PUBLIC gchar* address_to_str(wmem_allocator_t *scope, const address *addr); WS_DLL_PUBLIC gchar* address_with_resolution_to_str(wmem_allocator_t *scope, const address *addr); WS_DLL_PUBLIC gchar* tvb_address_with_resolution_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, int type, const gint offset); diff --git a/epan/tvbuff.h b/epan/tvbuff.h index 0505245a3a..c6470fa5c0 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -36,6 +36,7 @@ #include <glib.h> #include <epan/guid-utils.h> #include <epan/wmem/wmem.h> +#include <epan/ipv6-utils.h> #include "wsutil/ws_mempbrk.h" #ifdef __cplusplus @@ -55,7 +56,6 @@ extern "C" { struct tvbuff; typedef struct tvbuff tvbuff_t; -struct e_in6_addr; /* ipv6-utils.h */ struct nstime_t; /* nstime.h */ /** @defgroup tvbuff Testy, Virtual(-izable) Buffers |