diff options
| author | jb <jb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-28 18:16:25 +0000 |
|---|---|---|
| committer | jb <jb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-28 18:16:25 +0000 |
| commit | 591991781843398275024dccb18ed14aa4c29a91 (patch) | |
| tree | 32c3aa1e5557572b3c6590fd1484bfe945a6103c /libgfortran | |
| parent | c6cfb282dacb6e2c624d75e8da210c6c805723d1 (diff) | |
| download | ppe42-gcc-591991781843398275024dccb18ed14aa4c29a91.tar.gz ppe42-gcc-591991781843398275024dccb18ed14aa4c29a91.zip | |
Fix sign error in SYSTEM_CLOCK kind=4 Windows version.
2013-04-28 Janne Blomqvist <jb@gcc.gnu.org>
* intrinsics/system_clock.c (system_clock_4): Fix sign error in
Windows version.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198378 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/intrinsics/system_clock.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 25219aae7db..3f2e9d1c7c7 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2013-04-28 Janne Blomqvist <jb@gcc.gnu.org> + + * intrinsics/system_clock.c (system_clock_4): Fix sign error in + Windows version. + 2013-04-15 Tobias Burnus <burnus@net-b.de> * list_read.c (finish_separator): Initialize variable. @@ -37,7 +42,7 @@ (nml_get_obj_data): Likewise use the correct error mechanism. * io/transfer.c (hit_eof): Do not set AFTER_ENDFILE if in namelist mode. - + 2013-03-29 Tobias Burnus <burnus@net-b.de> PR fortran/56737 diff --git a/libgfortran/intrinsics/system_clock.c b/libgfortran/intrinsics/system_clock.c index 74a294db810..ba4cd474107 100644 --- a/libgfortran/intrinsics/system_clock.c +++ b/libgfortran/intrinsics/system_clock.c @@ -134,7 +134,7 @@ system_clock_4(GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, QueryPerformanceCounter has potential issues. */ uint32_t cnt = GetTickCount (); if (cnt > GFC_INTEGER_4_HUGE) - cnt -= GFC_INTEGER_4_HUGE - 1; + cnt = cnt - GFC_INTEGER_4_HUGE - 1; *count = cnt; } if (count_rate) |
