aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorPetr Gotthard <petr.gotthard@honeywell.com>2015-08-16 16:50:52 +0200
committerHadriel Kaplan <hadrielk@yahoo.com>2015-08-16 17:57:28 +0000
commit8b8d37801ce1dd7b592cabbc2da06aa05019912e (patch)
tree1902674179d7df0331e9feb584e7545d4e29ac49 /epan
parent6f7811ed6808a67488c2d3f5f0296946ab9d6dc0 (diff)
AMQP 1.0: Fix OSX build errors
packet-amqp.c:10660: warning: implicit conversion shortens 64-bit value into a 32-bit value packet-amqp.c:10661: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: Ic1c19edf10432dccb5fc4f3ea07defd45b9eef17 Reviewed-on: https://code.wireshark.org/review/10054 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-amqp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 51126b5b11..f497df6635 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -10657,8 +10657,8 @@ get_amqp_timestamp(nstime_t *nstime, tvbuff_t *tvb, guint offset)
gint64 msec;
msec = tvb_get_ntoh64(tvb, offset);
- nstime->secs = msec / 1000;
- nstime->nsecs = (msec % 1000)*1000;
+ nstime->secs = (time_t)(msec / 1000);
+ nstime->nsecs = (int)(msec % 1000)*1000;
}
static int