From f07af2a351c2096f84487b13c114a1925755eafb Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Wed, 16 Jan 2013 14:42:12 -0500 Subject: CycleClock: Handle Cray compiler --- Carpet/CycleClock/src/cycle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Carpet/CycleClock') 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) -- cgit v1.2.3