Merged with trunk R1612.

[ardour.git] / libs / ardour / ardour / cycles.h

diff --git a/libs/ardour/ardour/cycles.h b/libs/ardour/ardour/cycles.h
index f194988da95043a68483613e13e3e0ef677c383a..f1422880b86cc974c6c75bb8e328302389db56b1 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.
 
-    $Id$
 */
 
 #ifndef __ardour_cycles_h__
@@ -186,8 +185,19 @@ static inline cycles_t get_cycles (void)
 
 /* begin mach */
 #elif defined(__APPLE__)
-#include <CoreAudio/CoreAudioTypes.h>
+
+#ifdef HAVE_WEAK_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)
 {