diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-02 23:12:40 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-03 07:13:14 +0000 |
| commit | ee1b845fa85cb29208c087171e3a40857f2cc6b5 (patch) | |
| tree | e36dffc25db50617809e4cb381809d0d18d873d1 | |
| parent | 8363733e303be2ac1c34c76c85b5c1b705c747fc (diff) | |
| download | wireshark-ee1b845fa85cb29208c087171e3a40857f2cc6b5.tar.gz wireshark-ee1b845fa85cb29208c087171e3a40857f2cc6b5.tar.bz2 wireshark-ee1b845fa85cb29208c087171e3a40857f2cc6b5.zip | |
If you want nstime_t, include <wsutil/nstime.h>.
Don't just define struct nstime_t yourself.
Change-Id: I275f53c6c9f34813898e7ffe4493583017fbf7f0
Reviewed-on: https://code.wireshark.org/review/13021
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/tvbuff.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/tvbuff.h b/epan/tvbuff.h index c6470fa5c0..c962389730 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -37,6 +37,8 @@ #include <epan/guid-utils.h> #include <epan/wmem/wmem.h> #include <epan/ipv6-utils.h> + +#include <wsutil/nstime.h> #include "wsutil/ws_mempbrk.h" #ifdef __cplusplus @@ -56,8 +58,6 @@ extern "C" { struct tvbuff; typedef struct tvbuff tvbuff_t; -struct nstime_t; /* nstime.h */ - /** @defgroup tvbuff Testy, Virtual(-izable) Buffers * * Dissector use and management @@ -375,8 +375,8 @@ WS_DLL_PUBLIC gdouble tvb_get_ieee_double(tvbuff_t *tvb, const gint offset, cons * for purely multi-byte encodings such as ENC_UTF_16, ENC_UCS_*, etc. */ WS_DLL_PUBLIC -struct nstime_t* tvb_get_string_time(tvbuff_t *tvb, const gint offset, const gint length, - const guint encoding, struct nstime_t* ns, gint *endoff); +nstime_t* tvb_get_string_time(tvbuff_t *tvb, const gint offset, const gint length, + const guint encoding, nstime_t* ns, gint *endoff); /* Similar to above, but returns a GByteArray based on the case-insensitive * hex-char strings with optional separators, and with optional leading spaces. |