From 9dddc9b8820dce0051eaad08706a6d775e9a7477 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Wed, 24 Oct 2012 18:05:00 -0400
Subject: CarpetLib: Update cycle.h from upstream

---
 Carpet/CarpetLib/src/cycle.h | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/Carpet/CarpetLib/src/cycle.h b/Carpet/CarpetLib/src/cycle.h
index 5e0d332e2..d80f2ede8 100644
--- a/Carpet/CarpetLib/src/cycle.h
+++ b/Carpet/CarpetLib/src/cycle.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2003, 2007 Matteo Frigo
- * Copyright (c) 2003, 2007 Massachusetts Institute of Technology
+ * Copyright (c) 2003, 2007-8 Matteo Frigo
+ * Copyright (c) 2003, 2007-8 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -511,21 +511,3 @@ INLINE_ELAPSED(inline)
 #define HAVE_TICK_COUNTER
 #endif
 #endif /* HAVE_MIPS_ZBUS_TIMER */
-
-/*----------------------------------------------------------------*/
-/* Fallback -- this must be the last entry in this file */
-#if !defined(HAVE_TICK_COUNTER)
-
-typedef double ticks;
-
-static inline ticks getticks(void)
-{
-  static ticks counter = 0;
-
-  return ++ counter;
-}
-
-INLINE_ELAPSED(inline)
-
-#define HAVE_TICK_COUNTER
-#endif
-- 
cgit v1.2.3