13
0

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
This commit is contained in:
Hans Fugal 2006-08-11 15:24:49 +00:00
parent a1aa6d2ae1
commit af0680d49b

View File

@ -186,8 +186,19 @@ static inline cycles_t get_cycles (void)
/* begin mach */ /* begin mach */
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <CoreAudio/CoreAudioTypes.h>
#ifdef HAVE_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; typedef UInt64 cycles_t;
static inline cycles_t get_cycles (void) static inline cycles_t get_cycles (void)
{ {