5 files changed, 11 insertions, 9 deletions

diff --git a/src/HTTPServer/CMakeLists.txt b/src/HTTPServer/CMakeLists.txt
index b0efc810d..ab3828aae 100644
--- a/src/HTTPServer/CMakeLists.txt
+++ b/src/HTTPServer/CMakeLists.txt
@@ -24,6 +24,11 @@ SET (HDRS
 	NameValueParser.h
 	SslHTTPConnection.h)
 
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	set_source_files_properties(HTTPServer.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors -Wno-error=old-style-cast")
+	set_source_files_properties(HTTPConnection.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum")
+endif()
+
 if(NOT MSVC)
 	add_library(HTTPServer ${SRCS} ${HDRS})
 endif()
diff --git a/src/HTTPServer/HTTPConnection.cpp b/src/HTTPServer/HTTPConnection.cpp
index a5c6afd18..c6a45e6ed 100644
--- a/src/HTTPServer/HTTPConnection.cpp
+++ b/src/HTTPServer/HTTPConnection.cpp
@@ -213,7 +213,7 @@ void cHTTPConnection::OnReceivedData(const char * a_Data, size_t a_Size)
 			ASSERT(m_CurrentRequest != nullptr);
 			if (m_CurrentRequestBodyRemaining > 0)
 			{
-				size_t BytesToConsume = std::min(m_CurrentRequestBodyRemaining, (size_t)a_Size);
+				size_t BytesToConsume = std::min(m_CurrentRequestBodyRemaining, static_cast<size_t>(a_Size));
 				m_HTTPServer.RequestBody(*this, *m_CurrentRequest, a_Data, BytesToConsume);
 				m_CurrentRequestBodyRemaining -= BytesToConsume;
 			}
diff --git a/src/HTTPServer/HTTPFormParser.cpp b/src/HTTPServer/HTTPFormParser.cpp
index 72872078b..77f98e43b 100644
--- a/src/HTTPServer/HTTPFormParser.cpp
+++ b/src/HTTPServer/HTTPFormParser.cpp
@@ -90,11 +90,6 @@ void cHTTPFormParser::Parse(const char * a_Data, size_t a_Size)
 			m_MultipartParser->Parse(a_Data, a_Size);
 			break;
 		}
-		default:
-		{
-			ASSERT(!"Unhandled form kind");
-			break;
-		}
 	}
 }
 
@@ -113,7 +108,7 @@ bool cHTTPFormParser::Finish(void)
 			ParseFormUrlEncoded();
 			break;
 		}
-		default:
+		case fpkMultipart:
 		{
 			// Nothing needed for other formats
 			break;
diff --git a/src/HTTPServer/HTTPServer.cpp b/src/HTTPServer/HTTPServer.cpp
index 71f974a97..2eb8bf1ff 100644
--- a/src/HTTPServer/HTTPServer.cpp
+++ b/src/HTTPServer/HTTPServer.cpp
@@ -112,7 +112,9 @@ class cDebugCallbacks :
 			// TODO
 		}
 		
-} g_DebugCallbacks;
+};
+
+static cDebugCallbacks g_DebugCallbacks;
 
 
 
diff --git a/src/HTTPServer/SslHTTPConnection.cpp b/src/HTTPServer/SslHTTPConnection.cpp
index f8dea0731..7239741da 100644
--- a/src/HTTPServer/SslHTTPConnection.cpp
+++ b/src/HTTPServer/SslHTTPConnection.cpp
@@ -55,7 +55,7 @@ void cSslHTTPConnection::OnReceivedData(const char * a_Data, size_t a_Size)
 		int NumRead = m_Ssl.ReadPlain(Buffer, sizeof(Buffer));
 		if (NumRead > 0)
 		{
-			super::OnReceivedData(Buffer, (size_t)NumRead);
+			super::OnReceivedData(Buffer, static_cast<size_t>(NumRead));
 		}
 		else if (NumRead == POLARSSL_ERR_NET_WANT_READ)
 		{