diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-09-12 20:31:31 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-09-12 20:31:31 +0000 |
| commit | aa8fbf09d261e8baa62ad0bf98320d24825e5ba5 (patch) | |
| tree | 7b393da965af4415ecc99059052a40d676239e7f | |
| parent | 8d8c56d3e4099bf044a6249f9d59b979309d2ef0 (diff) | |
The secs field of an nstime_t is a time_t, so cast to that.
svn path=/trunk/; revision=51981
| -rw-r--r-- | epan/proto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/proto.c b/epan/proto.c index df055f15f2..c58821462e 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -1601,7 +1601,7 @@ proto_tree_new_item(field_info *new_fi, proto_tree *tree, #define TOD_BASETIME 2208988800ul todsecs = tvb_get_ntoh64(tvb, start) >> 12; - time_stamp.secs = (long)((todsecs / 1000000) - TOD_BASETIME); + time_stamp.secs = (time_t)((todsecs / 1000000) - TOD_BASETIME); time_stamp.nsecs = (int)((todsecs % 1000000) * 1000); break; @@ -1610,7 +1610,7 @@ proto_tree_new_item(field_info *new_fi, proto_tree *tree, * TOD time stamp, big-endian. */ todsecs = tvb_get_letoh64(tvb, start) >> 12 ; - time_stamp.secs = (long)((todsecs / 1000000) - TOD_BASETIME); + time_stamp.secs = (time_t)((todsecs / 1000000) - TOD_BASETIME); time_stamp.nsecs = (int)((todsecs % 1000000) * 1000); break; |