From f1148658f16fa29a944bd843fd69352e142a4d0e Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sat, 9 Mar 2002 05:48:38 +0000 Subject: [PATCH] posix.cc (_Jv_platform_gettimeofday): Make sure result doesn't get truncated to int. * posix.cc (_Jv_platform_gettimeofday): Make sure result doesn't get truncated to int. From-SVN: r50479 --- libjava/ChangeLog | 5 +++++ libjava/posix.cc | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 88c610cfca0a..08ed38114030 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-03-09 Bryce McKinlay + + * posix.cc (_Jv_platform_gettimeofday): Make sure result doesn't get + truncated to int. + 2002-03-08 Tom Tromey * include/jni.h: Include stdio.h. diff --git a/libjava/posix.cc b/libjava/posix.cc index f4b76962e35f..6b0ea8cad3c7 100644 --- a/libjava/posix.cc +++ b/libjava/posix.cc @@ -30,13 +30,13 @@ _Jv_platform_gettimeofday () #if defined (HAVE_GETTIMEOFDAY) timeval tv; gettimeofday (&tv, NULL); - return tv.tv_sec * 1000 + tv.tv_usec / 1000; + return (tv.tv_sec * 1000LL) + (tv.tv_usec / 1000LL); #elif defined (HAVE_TIME) - return time (NULL) * 1000; + return time (NULL) * 1000LL; #elif defined (HAVE_FTIME) struct timeb t; ftime (&t); - return t.time * 1000 + t.millitm; + return (t.time * 1000LL) + t.millitm; #elif defined (ECOS) // FIXME. return _clock();