diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2011-01-31 22:58:41 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2011-01-31 22:58:41 +0200 |
| commit | 3a13ffa951af1f72159d786b33dff68df43bb257 (patch) | |
| tree | 73db0ea4eb678bca88b1412c99da66731a0a9d9a /libgfortran | |
| parent | b6e7a3d1f97d5a2c611797ba52e75790888f0379 (diff) | |
| download | gcc-3a13ffa951af1f72159d786b33dff68df43bb257.zip gcc-3a13ffa951af1f72159d786b33dff68df43bb257.tar.gz gcc-3a13ffa951af1f72159d786b33dff68df43bb257.tar.bz2 | |
Fix GF_CLOCK_MONOTONIC from r169449
From-SVN: r169450
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 4 | ||||
| -rw-r--r-- | libgfortran/intrinsics/time_1.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 1c75539..8c7ad7a 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,5 +1,9 @@ 2011-01-31 Janne Blomqvist <jb@gcc.gnu.org> + * intrinsics/time_1.h: Fix definition of GF_CLOCK_MONOTONIC macro. + +2011-01-31 Janne Blomqvist <jb@gcc.gnu.org> + * configure.ac: Check for clock_gettime(). * configure: Regenerated. * config.h.in: Regenerated. diff --git a/libgfortran/intrinsics/time_1.h b/libgfortran/intrinsics/time_1.h index 5ee5d5a..4fd8235 100644 --- a/libgfortran/intrinsics/time_1.h +++ b/libgfortran/intrinsics/time_1.h @@ -184,7 +184,7 @@ gf_cputime (long *user_sec, long *user_usec, long *system_sec, long *system_usec #ifdef CLOCK_MONOTONIC #define GF_CLOCK_MONOTONIC CLOCK_MONOTONIC #else -#define GF_CLOCK_REALTIME GF_CLOCK_REALTIME +#define GF_CLOCK_MONOTONIC GF_CLOCK_REALTIME #endif /* Arguments: |