Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-11-15 18:06:23 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-15 18:06:23 (GMT) |
| commit | b6742f9054f368f634a2a269a7ca146a1b250f3b (patch) | |
| tree | fc27d9aeb1cb4410ba12a8a4e9f931ccc2c67861 | |
| parent | bd4e48adb3f23f80abc8441bf359166fbe9b621c (diff) | |
| download | swift-b6742f9054f368f634a2a269a7ca146a1b250f3b.zip swift-b6742f9054f368f634a2a269a7ca146a1b250f3b.tar.bz2 | |
Fix compilation on Windows.
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | Swiften/Network/Connector.h | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -117,14 +117,14 @@ Export("conf_env") # # Keeping both environments separated mostly because of SCons Issue 2391, # although it doesn't hurt to separate them (e.g. not have pretty printed # strings in config.log) ################################################################################ -if env["PLATFORM"] == "win32" : - env["MSVC_BATCH"] = 1 +#if env["PLATFORM"] == "win32" : +# env["MSVC_BATCH"] = 1 # Pretty output def colorize(command, target, color) : colors = { "red": "31", "green": "32", "yellow": "33", "blue": "34" } prefix = "" suffix = "" diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h index 084c416..44b4584 100644 --- a/Swiften/Network/Connector.h +++ b/Swiften/Network/Connector.h @@ -2,12 +2,13 @@ #include <deque> #include <boost/signal.hpp> #include <boost/shared_ptr.hpp> #include "Swiften/Network/Connection.h" +#include "Swiften/Network/HostAddressPort.h" #include "Swiften/Base/String.h" namespace Swift { class DomainNameResolver; class ConnectionFactory; |