From cb828d330a2dfe108b0905fad079d6a5c05388c1 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Sat, 11 Jan 2014 00:43:47 -0800
Subject: [PATCH] more windows build fixes

---
 .../audio/src/PositionalAudioRingBuffer.cpp   | 22 ++++++++++++-------
 libraries/octree-server/src/OctreeServer.cpp  |  1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/libraries/audio/src/PositionalAudioRingBuffer.cpp b/libraries/audio/src/PositionalAudioRingBuffer.cpp
index 7037eb2154..1d7a9a24f9 100644
--- a/libraries/audio/src/PositionalAudioRingBuffer.cpp
+++ b/libraries/audio/src/PositionalAudioRingBuffer.cpp
@@ -14,6 +14,12 @@
 
 #include "PositionalAudioRingBuffer.h"
 
+#ifdef _WIN32
+bool isnan_(double value) { return _isnan(value); }
+#else
+bool isnan_(double value) { return std::isnan(value); }
+#endif
+
 PositionalAudioRingBuffer::PositionalAudioRingBuffer(PositionalAudioRingBuffer::Type type) :
     AudioRingBuffer(NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL),
     _type(type),
@@ -22,7 +28,7 @@ PositionalAudioRingBuffer::PositionalAudioRingBuffer(PositionalAudioRingBuffer::
     _willBeAddedToMix(false),
     _shouldLoopbackForNode(false)
 {
-    
+
 }
 
 PositionalAudioRingBuffer::~PositionalAudioRingBuffer() {
@@ -33,25 +39,25 @@ int PositionalAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numByt
     currentBuffer += NUM_BYTES_RFC4122_UUID; // the source UUID
     currentBuffer += parsePositionalData(currentBuffer, numBytes - (currentBuffer - sourceBuffer));
     currentBuffer += writeData((char*) currentBuffer, numBytes - (currentBuffer - sourceBuffer));
-    
+
     return currentBuffer - sourceBuffer;
 }
 
 int PositionalAudioRingBuffer::parsePositionalData(unsigned char* sourceBuffer, int numBytes) {
     unsigned char* currentBuffer = sourceBuffer;
-    
+
     memcpy(&_position, currentBuffer, sizeof(_position));
     currentBuffer += sizeof(_position);
 
     memcpy(&_orientation, currentBuffer, sizeof(_orientation));
     currentBuffer += sizeof(_orientation);
-    
+
     // if this node sent us a NaN for first float in orientation then don't consider this good audio and bail
     if (std::isnan(_orientation.x)) {
         reset();
         return 0;
     }
-    
+
     return currentBuffer - sourceBuffer;
 }
 
@@ -66,12 +72,12 @@ bool PositionalAudioRingBuffer::shouldBeAddedToMix(int numJitterBufferSamples) {
     } else {
         // good buffer, add this to the mix
         _isStarved = false;
-        
+
         // since we've read data from ring buffer at least once - we've started
         _hasStarted = true;
-        
+
         return true;
     }
-    
+
     return false;
 }
diff --git a/libraries/octree-server/src/OctreeServer.cpp b/libraries/octree-server/src/OctreeServer.cpp
index 4ae08269ba..1b663503c7 100644
--- a/libraries/octree-server/src/OctreeServer.cpp
+++ b/libraries/octree-server/src/OctreeServer.cpp
@@ -11,6 +11,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QUuid>
 
+#include <time.h>
 #include <Logging.h>
 #include <UUID.h>