From af0680d49beac9beabe35815a0ed7a5b11538a82 Mon Sep 17 00:00:00 2001
From: Hans Fugal <hans@fugal.net>
Date: Fri, 11 Aug 2006 15:24:49 +0000
Subject: [PATCH]  r308@gandalf:  fugalh | 2006-08-11 08:49:54 -0600  OS X
 MacTypes.h/libgnomecanvasmm Rect problem workaround when COREAUDIO=0

git-svn-id: svn://localhost/ardour2/branches/undo@788 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/cycles.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/libs/ardour/ardour/cycles.h b/libs/ardour/ardour/cycles.h
index f194988da9..ad3e512669 100644
--- a/libs/ardour/ardour/cycles.h
+++ b/libs/ardour/ardour/cycles.h
@@ -186,8 +186,19 @@ static inline cycles_t get_cycles (void)
 
 /* begin mach */
 #elif defined(__APPLE__)
-#include <CoreAudio/CoreAudioTypes.h>
+
+#ifdef HAVE_COREAUDIO
 #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)
 {