osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2016-01-02 23:12:40 -08:00
parent 8363733e30
commit ee1b845fa8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/tvbuff.h
View File

@ -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.