summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-05-01 20:17:42 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-05-01 20:17:42 (GMT)
commitda300eb81a91b8e4cc9db0a9ca692d1a1891b429 (patch)
treeb9ffc93fbf437fc4bb635a82c86d36e21deca028
parentd94737ef177524014fbf9b1ee2b446825536514b (diff)
parent4fb9430a2e16b3ddf59ccbc1f267e8c98422ca6e (diff)
downloadswift-da300eb81a91b8e4cc9db0a9ca692d1a1891b429.zip
swift-da300eb81a91b8e4cc9db0a9ca692d1a1891b429.tar.bz2
Merge branch 'swift-1.x'
Conflicts: Swiften/History/HistoryManager.h Swiften/SConscript
-rw-r--r--Swiften/History/HistoryManager.h2
-rw-r--r--Swiften/History/HistoryMessage.h1
-rw-r--r--Swiften/SConscript2
3 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/History/HistoryManager.h b/Swiften/History/HistoryManager.h
index b06a29e..7a4324b 100644
--- a/Swiften/History/HistoryManager.h
+++ b/Swiften/History/HistoryManager.h
@@ -6,7 +6,7 @@
#pragma once
-#include <string>
+#include <vector>
#include <Swiften/JID/JID.h>
#include <Swiften/History/HistoryMessage.h>
diff --git a/Swiften/History/HistoryMessage.h b/Swiften/History/HistoryMessage.h
index 5e4782d..461f5de 100644
--- a/Swiften/History/HistoryMessage.h
+++ b/Swiften/History/HistoryMessage.h
@@ -6,6 +6,7 @@
#pragma once
+#include <Swiften/JID/JID.h>
#include <boost/date_time/posix_time/posix_time_types.hpp>
namespace Swift {
diff --git a/Swiften/SConscript b/Swiften/SConscript
index e00e59b..244022c 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -382,7 +382,7 @@ if env["SCONS_STAGE"] == "build" :
continue
# Library-specific files
- if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") or file.startswith("GConf") or file.startswith("MacOSX") or file.startswith("Windows") :
+ if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") or file.startswith("GConf") or file.startswith("MacOSX") or file.startswith("Windows") or file.startswith("SQLite") :
continue
# Specific headers we don't want to globally include