From d4b35ef74c433ebdfe3ee6eec561b50ef5a92a69 Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Tue, 17 Mar 2015 01:04:58 +0000 Subject: [PATCH] re PR fortran/64432 (SYSTEM_CLOCK(COUNT_RATE=rate) wrong result for integer(4)::rate) 2015-03-16 Jerry DeLisle PR libgfortran/64432 * intrinsics/system_clock.c (system_clock4, system_clock8): Cleanup some whitespace. From-SVN: r221472 --- libgfortran/ChangeLog | 6 ++++++ libgfortran/intrinsics/system_clock.c | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 5b201d21fa4..031b2ba3c37 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Jerry DeLisle + + PR libgfortran/64432 + * intrinsics/system_clock.c (system_clock4, system_clock8): + Cleanup some whitespace. + 2015-03-11 Thomas Schwinge * caf/single.c (caf_runtime_error): Revert 2014-11-28 changes. diff --git a/libgfortran/intrinsics/system_clock.c b/libgfortran/intrinsics/system_clock.c index 53c7ca0cc6f..ba0bdfe68cb 100644 --- a/libgfortran/intrinsics/system_clock.c +++ b/libgfortran/intrinsics/system_clock.c @@ -109,10 +109,14 @@ gf_gettime_mono (time_t * secs, long * fracsecs, long * tck) #endif /* !__MINGW32 && !__CYGWIN__ */ -extern void system_clock_4 (GFC_INTEGER_4 *, GFC_INTEGER_4 *, GFC_INTEGER_4 *); +extern void +system_clock_4 (GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, + GFC_INTEGER_4 *count_max); export_proto(system_clock_4); -extern void system_clock_8 (GFC_INTEGER_8 *, GFC_INTEGER_8 *, GFC_INTEGER_8 *); +extern void +system_clock_8 (GFC_INTEGER_8 *count, GFC_INTEGER_8 *count_rate, + GFC_INTEGER_8 *count_max); export_proto(system_clock_8); @@ -122,10 +126,10 @@ export_proto(system_clock_8); for COUNT. */ void -system_clock_4(GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, +system_clock_4 (GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, GFC_INTEGER_4 *count_max) { -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(__MINGW32__) || defined(__CYGWIN__) if (count) { /* Use GetTickCount here as the resolution and range is @@ -176,7 +180,7 @@ system_clock_4(GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, void system_clock_8 (GFC_INTEGER_8 *count, GFC_INTEGER_8 *count_rate, - GFC_INTEGER_8 *count_max) + GFC_INTEGER_8 *count_max) { #if defined(__MINGW32__) || defined(__CYGWIN__) LARGE_INTEGER cnt; -- 2.30.2