'libs/rubberband' - Compiler specific includes

diff --git a/libs/rubberband/src/StretchCalculator.cpp b/libs/rubberband/src/StretchCalculator.cpp
index 15417597623ec18cef883cd7655cc98e17707eef..18ee9cc9c3a45c8aa795122a73b7fd0ddb518762 100644 (file)
--- a/libs/rubberband/src/StretchCalculator.cpp
+++ b/libs/rubberband/src/StretchCalculator.cpp
@@ -12,6 +12,9 @@
     COPYING included with this distribution for more information.
 */
 
+#ifdef COMPILER_MSVC
+#include "bsd-3rdparty/float_cast/float_cast.h"
+#endif
 #include "StretchCalculator.h"
 
 #include <algorithm>

diff --git a/libs/rubberband/src/StretcherImpl.cpp b/libs/rubberband/src/StretcherImpl.cpp
index 200c8771a89d0a716cf170a3f2c206b799166657..d15a71d68ef0db3b4ee633fee83bc3990058decb 100644 (file)
--- a/libs/rubberband/src/StretcherImpl.cpp
+++ b/libs/rubberband/src/StretcherImpl.cpp
@@ -12,6 +12,9 @@
     COPYING included with this distribution for more information.
 */
 
+#ifdef COMPILER_MSVC
+#include "bsd-3rdparty/float_cast/float_cast.h"
+#endif
 #include "StretcherImpl.h"
 #include "PercussiveAudioCurve.h"
 #include "HighFrequencyAudioCurve.h"

diff --git a/libs/rubberband/src/Thread.cpp b/libs/rubberband/src/Thread.cpp
index 49f75b5b65f8b34ee629711d7959df64cba32dcd..959515afc7d284f0b505ccb60e103781e26c3c68 100644 (file)
--- a/libs/rubberband/src/Thread.cpp
+++ b/libs/rubberband/src/Thread.cpp
@@ -16,11 +16,11 @@
 
 #include <cstdlib>
 #include <iostream>
-#include <cstdlib>
 
-#include <cstdlib>
+#ifndef COMPILER_MSVC
 #include <sys/time.h>
 #include <time.h>
+#endif
 
 using std::cerr;
 using std::endl;

diff --git a/libs/rubberband/src/bsd-3rdparty/float_cast/float_cast.h b/libs/rubberband/src/bsd-3rdparty/float_cast/float_cast.h
index 1ba0e03bdcc7bab1267ae64b16310ca0ddaa05ca..0e3d8a4040de5bd167692d034d373630e8e17a3b 100644 (file)
--- a/libs/rubberband/src/bsd-3rdparty/float_cast/float_cast.h
+++ b/libs/rubberband/src/bsd-3rdparty/float_cast/float_cast.h
@@ -35,6 +35,9 @@
 **             long int lrint  (double x) ;
 */
 
+#ifndef __FLOAT_CAST_H__  // Added by JE - 30-11-2009
+#define __FLOAT_CAST_H__
+
 #if (defined (WIN32) || defined (_WIN32))
 
        #include        <math.h>
@@ -69,5 +72,5 @@
 
 #endif
 
-
+#endif  // __FLOAT_CAST_H__
 

diff --git a/libs/rubberband/src/main.cpp b/libs/rubberband/src/main.cpp
index 178685300b2d0c634ec44d3ed81f3b2c9509d50a..5f1d2ba9c379a99fb81d045800b001dda1f855b2 100644 (file)
--- a/libs/rubberband/src/main.cpp
+++ b/libs/rubberband/src/main.cpp
@@ -23,7 +23,7 @@
 #include <cstring>
 #include "sysutils.h"
 
-#ifdef __MSVC__
+#ifdef COMPILER_MSVC
 #include "bsd-3rdparty/getopt/getopt.h"
 #else
 #include <getopt.h>

diff --git a/libs/rubberband/src/sysutils.h b/libs/rubberband/src/sysutils.h
index a529afde0dc9de50cf4735773d38dcd93d8dfb8d..3883c59ff55dbd82bf514c7d6b4f36f05fd75357 100644 (file)
--- a/libs/rubberband/src/sysutils.h
+++ b/libs/rubberband/src/sysutils.h
@@ -15,7 +15,7 @@
 #ifndef _RUBBERBAND_SYSINFO_H_
 #define _RUBBERBAND_SYSINFO_H_
 
-#ifdef __MSVC__
+#ifdef COMPILER_MSVC
 #include "bsd-3rdparty/float_cast/float_cast.h"
 #define R__ __restrict
 #endif
@@ -28,11 +28,11 @@
 #define R__
 #endif
 
-#ifdef __MINGW32__
+#ifdef COMPILER_MINGW
 #include <malloc.h>
 #endif
 
-#ifdef __MSVC__
+#ifdef COMPILER_MSVC
 #define alloca _alloca
 #endif