3 files changed, 9 insertions, 7 deletions
diff --git a/src/HTTPServer/CMakeLists.txt b/src/HTTPServer/CMakeLists.txt
index b0efc810d..f6ef96d20 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")
+	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/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;