diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2013-01-16 14:42:12 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2013-01-16 14:42:12 -0500 |
| commit | f07af2a351c2096f84487b13c114a1925755eafb (patch) | |
| tree | 7f4fdb565034e1a7b8a35f3c94624150a02f668a /Carpet/CycleClock | |
| parent | 0441c40fe9ad49d9e25d360b0da7f69d26ca82e6 (diff) | |
CycleClock: Handle Cray compiler
Diffstat (limited to 'Carpet/CycleClock')
| -rw-r--r-- | Carpet/CycleClock/src/cycle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Carpet/CycleClock/src/cycle.h b/Carpet/CycleClock/src/cycle.h index 20de8755b..16edbfbb1 100644 --- a/Carpet/CycleClock/src/cycle.h +++ b/Carpet/CycleClock/src/cycle.h @@ -218,7 +218,7 @@ static __inline double elapsed(ticks t1, ticks t0) /* * X86-64 cycle counter */ -#if (defined(__GNUC__) || defined(__ICC) || defined(__SUNPRO_C)) && defined(__x86_64__) && !defined(HAVE_TICK_COUNTER) +#if (defined(__GNUC__) || defined(__ICC) || defined(__SUNPRO_C)) && !defined(_CRAYC) && defined(__x86_64__) && !defined(HAVE_TICK_COUNTER) typedef unsigned long long ticks; static __inline__ ticks getticks(void) |