From: John Emmas <johne53@tiscali.co.uk>
Date: Thu, 25 Jul 2013 08:14:40 +0000 (+0100)
Subject: 'libs/rubberband' - Platform specific includes
X-Git-Tag: 1.0.0~868^2~120
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=1828f5694fc8a5971fb8f4f58d8b9abc05434c63;p=ardour.git

'libs/rubberband' - Platform specific includes
---

diff --git a/libs/rubberband/src/Profiler.h b/libs/rubberband/src/Profiler.h
index 616a553ecb..d6897b817b 100644
--- a/libs/rubberband/src/Profiler.h
+++ b/libs/rubberband/src/Profiler.h
@@ -31,7 +31,7 @@
 #include <time.h>
 #else
 #include "sysutils.h"
-#ifndef _WIN32
+#ifndef PLATFORM_WINDOWS
 #include <sys/time.h>
 #endif
 #endif
diff --git a/libs/rubberband/src/RingBuffer.h b/libs/rubberband/src/RingBuffer.h
index 07312169a6..a9262c8cdc 100644
--- a/libs/rubberband/src/RingBuffer.h
+++ b/libs/rubberband/src/RingBuffer.h
@@ -20,7 +20,7 @@
 
 #include <cstring>
 
-#ifndef _WIN32
+#ifndef PLATFORM_WINDOWS
 #include <sys/mman.h>
 #endif
 
@@ -30,7 +30,7 @@
 
 //#define DEBUG_RINGBUFFER 1
 
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
 #define MLOCK(a,b) 1
 #define MUNLOCK(a,b) 1
 #else
diff --git a/libs/rubberband/src/Scavenger.h b/libs/rubberband/src/Scavenger.h
index d1b6ca9ffa..a922d7ec6e 100644
--- a/libs/rubberband/src/Scavenger.h
+++ b/libs/rubberband/src/Scavenger.h
@@ -19,7 +19,7 @@
 #include <list>
 #include <iostream>
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
 #include <sys/time.h>
 #endif
 
diff --git a/libs/rubberband/src/Thread.cpp b/libs/rubberband/src/Thread.cpp
index 959515afc7..d5a7b2f6ff 100644
--- a/libs/rubberband/src/Thread.cpp
+++ b/libs/rubberband/src/Thread.cpp
@@ -29,7 +29,7 @@ using std::string;
 namespace RubberBand
 {
 
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
 
 Thread::Thread() :
     m_id(0),
@@ -289,7 +289,7 @@ Condition::signal()
     SetEvent(m_condition);
 }
 
-#else /* !_WIN32 */
+#else /* !PLATFORM_WINDOWS */
 
 
 Thread::Thread() :
@@ -562,7 +562,7 @@ Condition::signal()
     pthread_cond_signal(&m_condition);
 }
 
-#endif /* !_WIN32 */
+#endif /* !PLATFORM_WINDOWS */
 
 MutexLocker::MutexLocker(Mutex *mutex) :
     m_mutex(mutex)
diff --git a/libs/rubberband/src/Thread.h b/libs/rubberband/src/Thread.h
index 061469297e..63a5a65b67 100644
--- a/libs/rubberband/src/Thread.h
+++ b/libs/rubberband/src/Thread.h
@@ -15,11 +15,11 @@
 #ifndef _RUBBERBAND_THREAD_H_
 #define _RUBBERBAND_THREAD_H_
 
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
 #include <windows.h>
-#else /* !_WIN32 */
+#else /* !PLATFORM_WINDOWS */
 #include <pthread.h>
-#endif /* !_WIN32 */
+#endif /* !PLATFORM_WINDOWS */
 
 #include <string>
 
@@ -33,7 +33,7 @@ namespace RubberBand
 class Thread
 {
 public:
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
     typedef HANDLE Id;
 #else
     typedef pthread_t Id;
@@ -53,7 +53,7 @@ protected:
     virtual void run() = 0;
 
 private:
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
     HANDLE m_id;
     bool m_extant;
     static DWORD WINAPI staticRun(LPVOID lpParam);
@@ -75,7 +75,7 @@ public:
     bool trylock();
 
 private:
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
     HANDLE m_mutex;
 #ifndef NO_THREAD_CHECKS
     DWORD m_lockedBy;
@@ -123,7 +123,7 @@ public:
     
 private:
 
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
     HANDLE m_mutex;
     HANDLE m_condition;
     bool m_locked;
diff --git a/libs/rubberband/src/main.cpp b/libs/rubberband/src/main.cpp
index 5f1d2ba9c3..cdc62e8afa 100644
--- a/libs/rubberband/src/main.cpp
+++ b/libs/rubberband/src/main.cpp
@@ -36,7 +36,7 @@
 using namespace std;
 using namespace RubberBand;
 
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
 using RubberBand::gettimeofday;
 using RubberBand::usleep;
 #endif
@@ -324,7 +324,7 @@ int main(int argc, char **argv)
     cerr << "Using time ratio " << ratio;
     cerr << " and frequency ratio " << frequencyshift << endl;
 
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
     RubberBand::
 #endif
     timeval tv;
@@ -495,7 +495,7 @@ int main(int argc, char **argv)
             }
             delete[] obf;
         } else {
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
             RubberBand::usleep(10000);
 #else
             usleep(10000);
@@ -510,7 +510,7 @@ int main(int argc, char **argv)
 
         cerr << "in: " << countIn << ", out: " << countOut << ", ratio: " << float(countOut)/float(countIn) << ", ideal output: " << lrint(countIn * ratio) << ", error: " << abs(lrint(countIn * ratio) - int(countOut)) << endl;
 
-#ifdef _WIN32
+#ifdef PLATFORM_WINDOWS
         RubberBand::
 #endif
         timeval etv;