From a94e371e5ccb7b46e8d9ba12e344f8e68aa96836 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Sun, 12 Jan 2014 21:27:25 -0800
Subject: [PATCH] fix more windows warnings

---
 CMakeLists.txt                 | 2 +-
 interface/src/VoxelSystem.cpp  | 4 ----
 libraries/octree/src/AABox.cpp | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e793ce560..cc5225f25e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(hifi)
 
 IF (WIN32)
-add_definitions( -DNOMINMAX )
+add_definitions( -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS )
 ENDIF(WIN32)
 
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH})
diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp
index 59a5fce55c..74307b2123 100644
--- a/interface/src/VoxelSystem.cpp
+++ b/interface/src/VoxelSystem.cpp
@@ -6,10 +6,6 @@
 //  Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
 //
 
-#ifdef _WIN32
-#define _timeval_
-#define _USE_MATH_DEFINES
-#endif
 
 #include <cstring>
 #include <cmath>
diff --git a/libraries/octree/src/AABox.cpp b/libraries/octree/src/AABox.cpp
index 50b0958ae4..670e2b8a6b 100644
--- a/libraries/octree/src/AABox.cpp
+++ b/libraries/octree/src/AABox.cpp
@@ -53,6 +53,7 @@ glm::vec3 AABox::getVertex(BoxVertex vertex) const {
             return _corner + glm::vec3(0, 0, _scale);
         case TOP_RIGHT_FAR:
             return _corner + glm::vec3(0, _scale, _scale);
+		default: //quiet windows warnings
         case TOP_LEFT_FAR:
             return _corner + glm::vec3(_scale, _scale, _scale);
     }
@@ -269,6 +270,7 @@ glm::vec3 AABox::getClosestPointOnFace(const glm::vec3& point, BoxFace face) con
             return glm::clamp(point, glm::vec3(_corner.x, _corner.y, _corner.z),
                 glm::vec3(_corner.x + _scale, _corner.y + _scale, _corner.z));
     
+		default: //quiet windows warnings
         case MAX_Z_FACE:
             return glm::clamp(point, glm::vec3(_corner.x, _corner.y, _corner.z + _scale),
                 glm::vec3(_corner.x + _scale, _corner.y + _scale, _corner.z + _scale));
@@ -349,6 +351,7 @@ glm::vec4 AABox::getPlane(BoxFace face) const {
         case MIN_Y_FACE: return glm::vec4(0.0f, -1.0f, 0.0f, _corner.y);
         case MAX_Y_FACE: return glm::vec4(0.0f, 1.0f, 0.0f, -_corner.y - _scale);
         case MIN_Z_FACE: return glm::vec4(0.0f, 0.0f, -1.0f, _corner.z);
+		default: //quiet windows warnings
         case MAX_Z_FACE: return glm::vec4(0.0f, 0.0f, 1.0f, -_corner.z - _scale);
     }
 }
@@ -360,6 +363,7 @@ BoxFace AABox::getOppositeFace(BoxFace face) {
         case MIN_Y_FACE: return MAX_Y_FACE;
         case MAX_Y_FACE: return MIN_Y_FACE;
         case MIN_Z_FACE: return MAX_Z_FACE;
+		default: //quiet windows warnings
         case MAX_Z_FACE: return MIN_Z_FACE;
     }
 }