From 6f86b96391c3b884386612170ec69a5476e90293 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Mon, 29 Jun 2015 14:50:33 +0100 Subject: [PATCH] Win32/64 build fixes --- src/StretcherChannelData.cpp | 2 ++ src/StretcherImpl.cpp | 1 + src/StretcherProcess.cpp | 1 + src/float_cast/float_cast.h | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/StretcherChannelData.cpp b/src/StretcherChannelData.cpp index adf6082..f896fbc 100644 --- a/src/StretcherChannelData.cpp +++ b/src/StretcherChannelData.cpp @@ -27,6 +27,8 @@ #include "system/Allocators.h" +#include + namespace RubberBand { diff --git a/src/StretcherImpl.cpp b/src/StretcherImpl.cpp index 7f74751..42e9c83 100644 --- a/src/StretcherImpl.cpp +++ b/src/StretcherImpl.cpp @@ -45,6 +45,7 @@ #include #include #include +#include using namespace RubberBand; diff --git a/src/StretcherProcess.cpp b/src/StretcherProcess.cpp index a5836b8..6dc26d5 100644 --- a/src/StretcherProcess.cpp +++ b/src/StretcherProcess.cpp @@ -43,6 +43,7 @@ #include #include #include +#include using namespace RubberBand; diff --git a/src/float_cast/float_cast.h b/src/float_cast/float_cast.h index 0aff010..0e862d0 100644 --- a/src/float_cast/float_cast.h +++ b/src/float_cast/float_cast.h @@ -38,7 +38,7 @@ ** long int lrint (double x) ; */ -#if (defined (WIN32) || defined (_WIN32)) +#if ((defined (WIN32) || defined (_WIN32)) && !defined (_WIN64)) #include