summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-08-19 19:57:42 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-08-19 19:57:42 (GMT)
commit74be9738c8dbb3bc037d0bcba0d7fc1539343630 (patch)
treecbdaeb25ca1955c56646b60f1e31adcb749c7e18
parentfffffda255d80a56def292a9f7adf101382bee1a (diff)
downloadswift-contrib-74be9738c8dbb3bc037d0bcba0d7fc1539343630.zip
swift-contrib-74be9738c8dbb3bc037d0bcba0d7fc1539343630.tar.bz2
Fixed Mac OS X compilation.
-rw-r--r--Swiften/Application/MacOSXApplicationPathProvider.cpp4
-rw-r--r--Swiften/Application/UnixApplicationPathProvider.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/Swiften/Application/MacOSXApplicationPathProvider.cpp b/Swiften/Application/MacOSXApplicationPathProvider.cpp
index 7e4931a..e4b17da 100644
--- a/Swiften/Application/MacOSXApplicationPathProvider.cpp
+++ b/Swiften/Application/MacOSXApplicationPathProvider.cpp
@@ -9,6 +9,8 @@
#include <iostream>
#include <mach-o/dyld.h>
+#include "Swiften/Base/ByteArray.h"
+
namespace Swift {
MacOSXApplicationPathProvider::MacOSXApplicationPathProvider(const String& name) : ApplicationPathProvider(name) {
@@ -34,7 +36,7 @@ boost::filesystem::path MacOSXApplicationPathProvider::getExecutableDir() const
ByteArray path;
uint32_t size = 4096;
path.resize(size);
- if (_NSGetExecutablePath(path, &size) == 0) {
+ if (_NSGetExecutablePath(path.getData(), &size) == 0) {
return boost::filesystem::path(path.toString().getUTF8Data()).parent_path();
}
else {
diff --git a/Swiften/Application/UnixApplicationPathProvider.h b/Swiften/Application/UnixApplicationPathProvider.h
index 170d53a..c361267 100644
--- a/Swiften/Application/UnixApplicationPathProvider.h
+++ b/Swiften/Application/UnixApplicationPathProvider.h
@@ -11,6 +11,8 @@
#include <iostream>
#include <unistd.h>
+#include "Swiften/Base/ByteArray.h"
+
namespace Swift {
class UnixApplicationPathProvider : public ApplicationPathProvider {
public: