diff options
-rw-r--r-- | libgfortran/ChangeLog | 5 | ||||
-rw-r--r-- | libgfortran/intrinsics/time_1.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index fc464a153ff..3506636c4a9 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2012-06-04 Janne Blomqvist <jb@gcc.gnu.org> + + PR fortran/53456 + * intrinsics/time_1.h (gf_cputime): Fix typo in clock_gettime branch. + 2012-06-01 Tobias Burnus <burnus@net-b.de> * intrinsics/chmod.c (chmod_func): On MinGW, don't set is_dir and diff --git a/libgfortran/intrinsics/time_1.h b/libgfortran/intrinsics/time_1.h index 98a20d2bb70..920b175f79a 100644 --- a/libgfortran/intrinsics/time_1.h +++ b/libgfortran/intrinsics/time_1.h @@ -178,7 +178,7 @@ gf_cputime (long *user_sec, long *user_usec, long *system_sec, long *system_usec struct timespec ts; int err = clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &ts); *user_sec = ts.tv_sec; - *user_usecs = ts.tv_nsec / 1000; + *user_usec = ts.tv_nsec / 1000; *system_sec = *system_usec = 0; return err; |