diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-10-24 18:05:00 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-10-24 18:05:00 -0400 |
| commit | 9dddc9b8820dce0051eaad08706a6d775e9a7477 (patch) | |
| tree | f40db209a8179ce923fbdbe293f011c403286a51 | |
| parent | a9c36d0d94188899a262ec14d7fd01a2c348f230 (diff) | |
CarpetLib: Update cycle.h from upstream
| -rw-r--r-- | Carpet/CarpetLib/src/cycle.h | 22 |
1 files 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 |