From 3a2277f5116cbf1ca3bc87ccb45eec5a9f2c80b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 27 Jan 2011 22:24:16 +0100
Subject: Fixed CLang warnings.


diff --git a/Swift/Controllers/Chat/MUCSearchController.cpp b/Swift/Controllers/Chat/MUCSearchController.cpp
index 0f66163..2b25e2a 100644
--- a/Swift/Controllers/Chat/MUCSearchController.cpp
+++ b/Swift/Controllers/Chat/MUCSearchController.cpp
@@ -99,7 +99,7 @@ void MUCSearchController::handleSearchService(const JID& jid) {
 }
 
 void MUCSearchController::handleDiscoServiceFound(const JID& jid, boost::shared_ptr<DiscoInfo> info) {
-	bool isMUC;
+	bool isMUC = false;
 	String name;
 	foreach (DiscoInfo::Identity identity, info->getIdentities()) {
 			if ((identity.getCategory() == "directory"
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript
index 5b1ce4e..b162e69 100644
--- a/Swiften/Config/SConscript
+++ b/Swiften/Config/SConscript
@@ -27,6 +27,7 @@ config_flags += cStringVariable(swiften_env, "LIBFLAGS", libflags)
 config_env = env.Clone()
 config_env.MergeFlags(config_env["SWIFTEN_FLAGS"])
 config_env.MergeFlags(config_env["BOOST_FLAGS"])
+config_env.MergeFlags(config_env["PLATFORM_FLAGS"])
 config_env.WriteVal("swiften-config.h", config_env.Value(config_flags))
 config_env.Program("swiften-config", [
 		"swiften-config.cpp"
diff --git a/Swiften/QA/TLSTest/CertificateTest.cpp b/Swiften/QA/TLSTest/CertificateTest.cpp
index 86e9568..769272b 100644
--- a/Swiften/QA/TLSTest/CertificateTest.cpp
+++ b/Swiften/QA/TLSTest/CertificateTest.cpp
@@ -4,6 +4,8 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
+#include <Swiften/Base/ByteArray.h>
+
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <boost/bind.hpp>
diff --git a/Swiften/QA/TLSTest/SConscript b/Swiften/QA/TLSTest/SConscript
index 034336e..14e2de0 100644
--- a/Swiften/QA/TLSTest/SConscript
+++ b/Swiften/QA/TLSTest/SConscript
@@ -13,6 +13,7 @@ if env["TEST"] :
 	if myenv.get("HAVE_OPENSSL") :
 		myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
 		myenv.Append(CPPDEFINES = ["HAVE_OPENSSL"])
+	myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
 	
 	tester = myenv.Program("TLSTest", [
 			"CertificateTest.cpp",
-- 
cgit v0.10.2-6-g49f6