diff options
| author | Robin Gareus <robin@gareus.org> | 2015-03-31 16:05:15 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-03-31 16:05:15 +0200 |
| commit | 47110c983c48fb683a9f78b50923b06db5e341c8 (patch) | |
| tree | fd3c31c337f66c38c5e941595e8c65d2fbcf4098 | |
| parent | e2271c84e7e759ea4ffc6e89c79ba61cfb84f5d5 (diff) | |
fix OSX/PPC 10.4 long maths
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/selection_memento.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/lmath.h | 13 | ||||
| -rw-r--r-- | libs/ardour/tempo.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/ticker.cc | 1 | ||||
| -rw-r--r-- | libs/canvas/wave_view.cc | 1 |
7 files changed, 19 insertions, 0 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index ae170b8548..15fd85c229 100644 --- 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 220909c44b..8ea9dd2f9a 100644 --- 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 c190d7e6ae..ae3ad730ad 100644 --- 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 index 0000000000..bac1457cde --- /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 ff6553e820..2f29a0dabf 100644 --- 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 15326af882..7a2fa32ad7 100644 --- 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 c0496ef0c1..cd143899ac 100644 --- 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" |