aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mason <rbmj@verizon.net>2012-06-04 22:13:49 +0300
committerJanne Blomqvist <jb@gcc.gnu.org>2012-06-04 22:13:49 +0300
commit1e5c1001b4b44b2bf9f1b5850eaaeefb98d6264d (patch)
tree3128edd4897c4e1494e9024889be4dfbc2883bf2
parentfbc932e72cff3eb14122acb92415bbc0def82d74 (diff)
downloadgcc-1e5c1001b4b44b2bf9f1b5850eaaeefb98d6264d.zip
gcc-1e5c1001b4b44b2bf9f1b5850eaaeefb98d6264d.tar.gz
gcc-1e5c1001b4b44b2bf9f1b5850eaaeefb98d6264d.tar.bz2
PR 53456 Fix typo in gf_cputime.
2012-06-04 Robert Mason <rbmj@verizon.net> Janne Blomqvist <jb@gcc.gnu.org> PR fortran/53456 * intrinsics/time_1.h (gf_cputime): Fix typo in clock_gettime branch. From-SVN: r188201
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/intrinsics/time_1.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index fc464a1..3506636 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 98a20d2..920b175 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;