summaryrefslogtreecommitdiff
path: root/epan/tvbuff.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-01-02 20:01:12 -0800
committerGuy Harris <guy@alum.mit.edu>2016-01-03 04:01:39 +0000
commit8363733e303be2ac1c34c76c85b5c1b705c747fc (patch)
treeaeb29d500d20990e52490d98ffd916d6c6c0bde5 /epan/tvbuff.h
parentd4f7f21b51532c1a45a43764fa92cd55e17931de (diff)
downloadwireshark-8363733e303be2ac1c34c76c85b5c1b705c747fc.tar.gz
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>
Diffstat (limited to 'epan/tvbuff.h')
-rw-r--r--epan/tvbuff.h2
1 files changed, 1 insertions, 1 deletions
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