From 8363733e303be2ac1c34c76c85b5c1b705c747fc Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Sat, 2 Jan 2016 20:01:12 -0800
Subject: [PATCH] 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>
---
 epan/addr_resolv.h | 1 -
 epan/to_str.h      | 3 +--
 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