aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-11-10 12:31:17 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-11-10 12:31:17 +0000
commit617f2eddeff196df4c8ef819c57ecf564f48cbf5 (patch)
treea45ec5bad27c546a965f2604cf559029f15d8eb3 /epan
parente7e010be584ba7bec9bff6a0ad5b70415dfd9c82 (diff)
Remove <epan/ipv6-utils.h> from tvbuff.
svn path=/trunk/; revision=53221
Diffstat (limited to 'epan')
-rw-r--r--epan/addr_and_mask.c1
-rw-r--r--epan/addr_resolv.h1
-rw-r--r--epan/tvbuff.h3
3 files changed, 4 insertions, 1 deletions
diff --git a/epan/addr_and_mask.c b/epan/addr_and_mask.c
index fc32cef87d..065208a022 100644
--- a/epan/addr_and_mask.c
+++ b/epan/addr_and_mask.c
@@ -29,6 +29,7 @@
#include <string.h>
#include "tvbuff.h"
+#include "ipv6-utils.h"
#include "addr_and_mask.h"
guint32
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 6729d60718..e4c6a6fe72 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -36,6 +36,7 @@
#include <epan/address.h>
#include <epan/tvbuff.h>
+#include <epan/ipv6-utils.h>
#include <epan/to_str.h>
#include <wiretap/wtap.h>
#include "ws_symbol_export.h"
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 334173c011..28d64b50cf 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -36,7 +36,6 @@
#define __TVBUFF_H__
#include <glib.h>
-#include <epan/ipv6-utils.h>
#include <epan/guid-utils.h>
#include <epan/wmem/wmem.h>
@@ -57,6 +56,8 @@ extern "C" {
struct tvbuff;
typedef struct tvbuff tvbuff_t;
+struct e_in6_addr; /* ipv6-utils.h */
+
/** @defgroup tvbuff Testy, Virtual(-izable) Buffers
*
* Dissector use and management