summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-05-01 20:14:22 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-05-01 20:14:22 (GMT)
commit4fb9430a2e16b3ddf59ccbc1f267e8c98422ca6e (patch)
treeeb3ef9b658946e9725d19927b3b70fe661a6a707
parent4a90cf8fd5da66c2466bfcfe1e5152d45457b291 (diff)
downloadswift-4fb9430a2e16b3ddf59ccbc1f267e8c98422ca6e.zip
swift-4fb9430a2e16b3ddf59ccbc1f267e8c98422ca6e.tar.bz2
Fixed compilation.
-rw-r--r--Swiften/History/HistoryManager.h6
-rw-r--r--Swiften/History/HistoryMessage.h1
-rw-r--r--Swiften/SConscript2
3 files changed, 5 insertions, 4 deletions
diff --git a/Swiften/History/HistoryManager.h b/Swiften/History/HistoryManager.h
index c918cbc..7a4324b 100644
--- a/Swiften/History/HistoryManager.h
+++ b/Swiften/History/HistoryManager.h
@@ -6,9 +6,9 @@
#pragma once
-#include <string>
-#include "Swiften/JID/JID.h"
-#include "Swiften/History/HistoryMessage.h"
+#include <vector>
+#include <Swiften/JID/JID.h>
+#include <Swiften/History/HistoryMessage.h>
namespace Swift {
class HistoryManager {
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 9de71fb..110f202 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -354,7 +354,7 @@ if env["SCONS_STAGE"] == "build" :
continue
# Library-specific files
- if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") :
+ if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") or file.startswith("SQLite") :
continue
# Specific headers we don't want to globally include