diff options
| author | Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2010-06-09 12:55:22 +0000 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2010-06-09 12:55:22 +0000 |
| commit | b807f4f826c9d1ddf96df2ed54f6e6fe94f3df6a (patch) | |
| tree | 6cc925a0b4b4f11c38b43314fc34d02a96b67559 | |
| parent | 76c857431e7e5887fa28ba9a50f098a9fbe2a3e9 (diff) | |
| download | gcc-b807f4f826c9d1ddf96df2ed54f6e6fe94f3df6a.tar.gz | |
system_clock.c (system_clock_4, [...]): Undefine TCK.
* intrinsics/system_clock.c (system_clock_4, system_clock_8):
Undefine TCK.
From-SVN: r160469
| -rw-r--r-- | libgfortran/ChangeLog | 5 | ||||
| -rw-r--r-- | libgfortran/intrinsics/system_clock.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 84675b92ba5..d2acafd0945 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2010-06-09 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + * intrinsics/system_clock.c (system_clock_4, system_clock_8): + Undefine TCK. + 2010-06-04 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/34670 diff --git a/libgfortran/intrinsics/system_clock.c b/libgfortran/intrinsics/system_clock.c index 7806059ccdf..7cc82d0c8cd 100644 --- a/libgfortran/intrinsics/system_clock.c +++ b/libgfortran/intrinsics/system_clock.c @@ -56,6 +56,7 @@ system_clock_4(GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, GFC_INTEGER_4 mx; #if defined(HAVE_SYS_TIME_H) && defined(HAVE_GETTIMEOFDAY) +#undef TCK #define TCK 1000 struct timeval tp1; @@ -117,6 +118,7 @@ system_clock_8 (GFC_INTEGER_8 *count, GFC_INTEGER_8 *count_rate, GFC_INTEGER_8 mx; #if defined(HAVE_SYS_TIME_H) && defined(HAVE_GETTIMEOFDAY) +#undef TCK #define TCK 1000000 struct timeval tp1; |