fix OSX/PPC 10.4 long maths

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index ae170b8548f3cabcbed7d5be08a402873aec460c..15fd85c229d5eb5d8db35efc995a3a41f3fddf15 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -31,6 +31,7 @@
 #include "gtkmm2ext/rgb_macros.h"
 
 #include "ardour/profile.h"
+#include "ardour/lmath.h"
 #include "ardour/session.h"
 #include "ardour/slave.h"
 #include "ardour/tempo.h"

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 220909c44b10a8348a03dd4c88aa680e850bda0f..8ea9dd2f9aea389ae215d8ceff19e1f92331194d 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -68,6 +68,7 @@
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/audioregion.h"
+#include "ardour/lmath.h"
 #include "ardour/location.h"
 #include "ardour/profile.h"
 #include "ardour/route_group.h"

diff --git a/gtk2_ardour/selection_memento.cc b/gtk2_ardour/selection_memento.cc
index c190d7e6aea9988c10cbaf021ab793f67bdacdd2..ae3ad730ad6aed67983d907e33bd1e1b280ad84c 100644 (file)
--- a/gtk2_ardour/selection_memento.cc
+++ b/gtk2_ardour/selection_memento.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include "ardour/lmath.h"
 #include "selection_memento.h"
 #include "editing.h"
 #include "public_editor.h"

diff --git a/libs/ardour/ardour/lmath.h b/libs/ardour/ardour/lmath.h
new file mode 100644 (file)
index 0000000..bac1457
--- /dev/null
+++ b/libs/ardour/ardour/lmath.h
@@ -0,0 +1,13 @@
+#include "math.h"
+
+#if defined __DARWIN_NO_LONG_LONG && defined MAC_OS_X_VERSION_MIN_REQUIRED && MAC_OS_X_VERSION_MIN_REQUIRED <= 1040
+static inline long long int llrint ( double x )
+{
+       return (long long int)rint( x );
+}
+
+static inline long long int llrintf (float x)
+{
+       return (long long int)rintf ( x );
+}
+#endif

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index ff6553e82048feb42388b7ec0c6016503322c233..2f29a0dabf059807889371b01e21e7151d559003 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -27,6 +27,7 @@
 #include "pbd/xml++.h"
 #include "evoral/types.hpp"
 #include "ardour/debug.h"
+#include "ardour/lmath.h"
 #include "ardour/tempo.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 15326af88242485d28c2122098f7e7719b3aac49..7a2fa32ad76b1dfe65794fa44fc64c0314d6312f 100644 (file)
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -25,6 +25,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/midi_buffer.h"
 #include "ardour/midi_port.h"
+#include "ardour/lmath.h"
 #include "ardour/ticker.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"

diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc
index c0496ef0c10cf6f6baf63777803893635a14033b..cd143899ac26717099484a24465a5812fccad399 100644 (file)
--- a/libs/canvas/wave_view.cc
+++ b/libs/canvas/wave_view.cc
@@ -29,6 +29,7 @@
 
 #include "ardour/types.h"
 #include "ardour/dB.h"
+#include "ardour/lmath.h"
 #include "ardour/audioregion.h"
 
 #include "canvas/wave_view.h"