From 33ca70bed177bd9d71134d851f1c32d09ec29bb4 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 14 Feb 2001 09:38:10 +0000 Subject: [PATCH] Sigh. Microsoft Visual C++ 6.0 won't convert a "guint64" to a "double" - it only allows you to convert a *signed* 64-bit integer to a "double". Cast the result of "pletohll()" to "gint64" before returning it from a function that returns a "double". svn path=/trunk/; revision=3033 --- wiretap/netxray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiretap/netxray.c b/wiretap/netxray.c index a5e69aa577..1a9e54ca95 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1,6 +1,6 @@ /* netxray.c * - * $Id: netxray.c,v 1.35 2001/02/13 00:50:05 guy Exp $ + * $Id: netxray.c,v 1.36 2001/02/14 09:38:10 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -108,7 +108,7 @@ static gboolean netxray_dump_close_1_1(wtap_dumper *wdh, int *err); static double netxray_ticks2double(netxray_ticks *t) { # ifdef G_HAVE_GINT64 - return pletohll(t); + return (gint64)pletohll(t); # else return pletohl(&t->lo) + pletohl(&t->hi) * 4294967296.0;