projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the extra "long".
[ardour.git]
/
libs
/
ardour
/
ardour
/
cycles.h
diff --git
a/libs/ardour/ardour/cycles.h
b/libs/ardour/ardour/cycles.h
index a6f34d59be5d16a77a72f09ccac99d4908de648a..2199a2eb9cfc096a2f724287a713032954bbfae2 100644
(file)
--- a/
libs/ardour/ardour/cycles.h
+++ b/
libs/ardour/ardour/cycles.h
@@
-16,7
+16,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#ifndef __ardour_cycles_h__
*/
#ifndef __ardour_cycles_h__
@@
-49,10
+48,10
@@
extern cycles_t cacheflush_time;
static inline cycles_t get_cycles (void)
{
static inline cycles_t get_cycles (void)
{
-
uint32_t long
ret;
+
cycles_t
ret;
rdtscll(ret);
rdtscll(ret);
- return ret;
+ return ret
& 0xffffffff
;
}
#elif defined(__powerpc__)
}
#elif defined(__powerpc__)
@@
-187,17
+186,7
@@
static inline cycles_t get_cycles (void)
/* begin mach */
#elif defined(__APPLE__)
/* begin mach */
#elif defined(__APPLE__)
-#ifdef HAVE_WEAK_COREAUDIO
#include <CoreAudio/HostTime.h>
#include <CoreAudio/HostTime.h>
-#else // Due to MacTypes.h and libgnomecanvasmm Rect conflict
-typedef unsigned long long UInt64;
-
-extern UInt64
-AudioGetCurrentHostTime();
-
-extern UInt64
-AudioConvertHostTimeToNanos(UInt64 inHostTime);
-#endif
typedef UInt64 cycles_t;
static inline cycles_t get_cycles (void)
typedef UInt64 cycles_t;
static inline cycles_t get_cycles (void)