summaryrefslogtreecommitdiff
path: root/wiretap/netxray.c
diff options
context:
space:
mode:
authorMichael Tüxen <tuexen@fh-muenster.de>2006-10-23 17:12:48 +0000
committerMichael Tüxen <tuexen@fh-muenster.de>2006-10-23 17:12:48 +0000
commit3ce4a7041295e1f1ed6fe55accab30791ee06774 (patch)
treebc0780abd851ce6d6a086e76a981740d4f65bfce /wiretap/netxray.c
parentb09b3c5f46a4bcd104622e190d359b753ddbb252 (diff)
downloadwireshark-3ce4a7041295e1f1ed6fe55accab30791ee06774.tar.gz
Use G_GINT64_CONSTANT to handle 64-bit constants in the code.
svn path=/trunk/; revision=19663
Diffstat (limited to 'wiretap/netxray.c')
-rw-r--r--wiretap/netxray.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index 24c9c42645..c7d3b05f41 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1465,9 +1465,9 @@ static gboolean netxray_dump_1_1(wtap_dumper *wdh,
memset(&rec_hdr, '\0', sizeof(rec_hdr));
timestamp = ((guint64)phdr->ts.secs - (guint64)netxray->start.secs)*1000000
+ ((guint64)phdr->ts.nsecs)/1000;
- t32 = (guint32)(timestamp%4294967296);
+ t32 = (guint32)(timestamp%G_GINT64_CONSTANT(4294967296));
rec_hdr.timelo = htolel(t32);
- t32 = (guint32)(timestamp/4294967296);
+ t32 = (guint32)(timestamp/G_GINT64_CONSTANT(4294967296));
rec_hdr.timehi = htolel(t32);
rec_hdr.orig_len = htoles(phdr->len);
rec_hdr.incl_len = htoles(phdr->caplen);
@@ -1657,9 +1657,9 @@ static gboolean netxray_dump_2_0(wtap_dumper *wdh,
memset(&rec_hdr, '\0', sizeof(rec_hdr));
timestamp = ((guint64)phdr->ts.secs - (guint64)netxray->start.secs)*1000000
+ ((guint64)phdr->ts.nsecs)/1000;
- t32 = (guint32)(timestamp%4294967296);
+ t32 = (guint32)(timestamp%G_GINT64_CONSTANT(4294967296));
rec_hdr.timelo = htolel(t32);
- t32 = (guint32)(timestamp/4294967296);
+ t32 = (guint32)(timestamp/G_GINT64_CONSTANT(4294967296));
rec_hdr.timehi = htolel(t32);
rec_hdr.orig_len = htoles(phdr->len);
rec_hdr.incl_len = htoles(phdr->caplen);