diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:08:43 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:08:43 -0400 |
| commit | bb59def1ca8a21f915cf636dd1e54957df981656 (patch) | |
| tree | b5e7a94ffc73532a85909c50ca1bfeb7e7971ffe /libs | |
| parent | 98c6ca5abcb8901f70b2790ecd9cec51385fab6b (diff) | |
fixes for windows branch build failures under linux. still does not build on linux, now due to taglib changes
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/evoral/src/ControlList.cpp | 7 | ||||
| -rw-r--r-- | libs/evoral/src/Curve.cpp | 1 | ||||
| -rw-r--r-- | libs/evoral/src/libsmf/smf_load.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 18803af348..ff624809e8 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -16,11 +16,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -// 'std::isnan()' is not available in MSVC. -#ifndef COMPILER_MSVC -using std::isnan; -#endif - #include <cmath> #include <cassert> #include <utility> @@ -817,7 +812,7 @@ ControlList::modify (iterator iter, double when, double val) (*iter)->when = when; (*iter)->value = val; - if (isnan (val)) { + if (::isnan (val)) { abort (); } diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp index a813eb7062..44fc48f728 100644 --- a/libs/evoral/src/Curve.cpp +++ b/libs/evoral/src/Curve.cpp @@ -22,6 +22,7 @@ #include <climits> #include <cfloat> #include <cmath> +#include <vector> #include <glibmm/threads.h> diff --git a/libs/evoral/src/libsmf/smf_load.c b/libs/evoral/src/libsmf/smf_load.c index 25d95baecd..fed4d28bb7 100644 --- a/libs/evoral/src/libsmf/smf_load.c +++ b/libs/evoral/src/libsmf/smf_load.c @@ -123,7 +123,7 @@ parse_mthd_header(smf_t *smf) return (-1); } - tmp_mthd = (chunk_header_struct*)smf->file_buffer; + tmp_mthd = (struct chunk_header_struct*)smf->file_buffer; if (!chunk_signature_matches(tmp_mthd, "MThd")) { g_critical("SMF error: MThd signature not found, is that a MIDI file?"); |