summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-10 21:32:59 +0000
committerDavid Robillard <d@drobilla.net>2012-05-10 21:32:59 +0000
commit00957dd74a97252d9a790141cb7f475573da1a91 (patch)
tree2078ad821556bebbdbb26d958ab74a918f3bb083
parent0c9e861caa8b1eed5068942edc35d5f91bac816e (diff)
downloadingen-00957dd74a97252d9a790141cb7f475573da1a91.tar.gz
ingen-00957dd74a97252d9a790141cb7f475573da1a91.tar.bz2
ingen-00957dd74a97252d9a790141cb7f475573da1a91.zip
Fix compilation on Mac OS X.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4342 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/client/ClientStore.cpp4
-rw-r--r--src/socket/SocketWriter.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index ad5c6a60..a1da01c4 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -236,14 +236,14 @@ ClientStore::move(const Raul::Path& old_path, const Raul::Path& new_path)
return;
}
- typedef Table<Raul::Path, SharedPtr<GraphObject> > Removed;
+ typedef Raul::Table<Raul::Path, SharedPtr<GraphObject> > Removed;
iterator end = find_descendants_end(parent);
SharedPtr<Removed> removed = yank(parent, end);
assert(removed->size() > 0);
- typedef Table<Raul::Path, SharedPtr<GraphObject> > PathTable;
+ typedef Raul::Table<Raul::Path, SharedPtr<GraphObject> > PathTable;
for (PathTable::iterator i = removed->begin(); i != removed->end(); ++i) {
const Raul::Path& child_old_path = i->first;
assert(Raul::Path::descendant_comparator(old_path, child_old_path));
diff --git a/src/socket/SocketWriter.cpp b/src/socket/SocketWriter.cpp
index e704e5af..9a9decd7 100644
--- a/src/socket/SocketWriter.cpp
+++ b/src/socket/SocketWriter.cpp
@@ -22,6 +22,10 @@
#include "SocketWriter.hpp"
+#ifndef MSG_NOSIGNAL
+# define MSG_NOSIGNAL 0
+#endif
+
namespace Ingen {
namespace Socket {