From ab590440be3f3fa70e99a762579b2d43cc6da19e Mon Sep 17 00:00:00 2001
From: Seefo <rezen1911@gmail.com>
Date: Mon, 23 Feb 2015 22:15:24 -0500
Subject: [PATCH] Cleaned up warnings on Windows

---
 libraries/metavoxels/src/Spanner.cpp | 12 ++++++------
 tests/jitter/src/main.cpp            |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/metavoxels/src/Spanner.cpp b/libraries/metavoxels/src/Spanner.cpp
index fbd0d311f5..fd5a59fdfb 100644
--- a/libraries/metavoxels/src/Spanner.cpp
+++ b/libraries/metavoxels/src/Spanner.cpp
@@ -1959,7 +1959,7 @@ HeightfieldNode* HeightfieldNode::fillHeight(const glm::vec3& translation, const
     } else {
         colorWidth = innerHeightWidth + HeightfieldData::SHARED_EDGE;
         colorHeight = innerHeightHeight + HeightfieldData::SHARED_EDGE;
-        newColorContents = QByteArray(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFF);
+        newColorContents = QByteArray(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFFu);
     }
     int innerColorWidth = colorWidth - HeightfieldData::SHARED_EDGE;
     int innerColorHeight = colorHeight - HeightfieldData::SHARED_EDGE;
@@ -2185,7 +2185,7 @@ HeightfieldNode* HeightfieldNode::setMaterial(const glm::vec3& translation, cons
     } else {
         colorWidth = innerHeightWidth + HeightfieldData::SHARED_EDGE;
         colorHeight = innerHeightHeight + HeightfieldData::SHARED_EDGE;
-        newColorContents = QByteArray(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFF);
+        newColorContents = QByteArray(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFFu);
     }
     int innerColorWidth = colorWidth - HeightfieldData::SHARED_EDGE;
     int innerColorHeight = colorHeight - HeightfieldData::SHARED_EDGE;
@@ -2428,7 +2428,7 @@ HeightfieldNode* HeightfieldNode::setMaterial(const glm::vec3& translation, cons
                             }
                         }
                     }
-                    bool nextAlphaY = stackDest->getEntryAlpha(y + 1, voxelHeight);
+                    int nextAlphaY = stackDest->getEntryAlpha(y + 1, voxelHeight);
                     if (nextAlphaY == currentAlpha) {
                         entryDest->hermiteY = 0;
                     
@@ -2447,7 +2447,7 @@ HeightfieldNode* HeightfieldNode::setMaterial(const glm::vec3& translation, cons
                     }
                     int nextStackZ = (int)stackZ + 1;
                     if (nextStackZ <= innerStackHeight) {
-                        bool nextAlphaZ = newStackContents.at(nextStackZ * stackWidth + (int)stackX).getEntryAlpha(
+                        int nextAlphaZ = newStackContents.at(nextStackZ * stackWidth + (int)stackX).getEntryAlpha(
                             y, nextVoxelHeightZ);
                         if (nextAlphaZ == currentAlpha) {
                             entryDest->hermiteZ = 0;
@@ -2828,7 +2828,7 @@ void HeightfieldNode::mergeChildren(bool height, bool colorMaterial) {
         _height.reset();
     }
     if (colorWidth > 0 && colorMaterial) {
-        QByteArray colorContents(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFF);
+        QByteArray colorContents(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFFu);
         for (int i = 0; i < CHILD_COUNT; i++) {
             HeightfieldColorPointer childColor = _children[i]->getColor();
             if (!childColor) {
@@ -3266,7 +3266,7 @@ HeightfieldNode* HeightfieldNode::subdivide(const QVector<quint16>& heightConten
     }
     for (int i = 0; i < CHILD_COUNT; i++) {
         QVector<quint16> childHeightContents(heightWidth * heightHeight);
-        QByteArray childColorContents(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFF);
+        QByteArray childColorContents(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFFu);
         QByteArray childMaterialContents(materialWidth * materialHeight, 0);
         QVector<StackArray> childStackContents(stackWidth * stackHeight);
         
diff --git a/tests/jitter/src/main.cpp b/tests/jitter/src/main.cpp
index baaa2d08d6..788ae89c6f 100644
--- a/tests/jitter/src/main.cpp
+++ b/tests/jitter/src/main.cpp
@@ -8,7 +8,7 @@
 
 #include <iostream>
 #ifdef _WINDOWS
-#include <winsock2.h>
+#include <WS2tcpip.h>
 #else
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -76,7 +76,7 @@ void runSend(const char* addressOption, int port, int gap, int size, int report)
 
     memset(&servaddr, 0, sizeof(servaddr));
     servaddr.sin_family = AF_INET;
-    servaddr.sin_addr.s_addr = inet_addr(addressOption);
+    inet_pton(AF_INET, addressOption, &servaddr.sin_addr);
     servaddr.sin_port = htons(port);
 
     const int SAMPLES_FOR_SECOND = 1000000 / gap;