summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-22 00:50:51 +0000
committerDavid Robillard <d@drobilla.net>2011-10-22 00:50:51 +0000
commite5e5aec31c5369d8f283852b5f4b307bea6c4a29 (patch)
tree4434b8176b4da40510370f3c6f8ab3da978665a3
parent99293e4373da46c60019e4f629782a243b03d315 (diff)
downloadlilv-e5e5aec31c5369d8f283852b5f4b307bea6c4a29.tar.gz
lilv-e5e5aec31c5369d8f283852b5f4b307bea6c4a29.tar.bz2
lilv-e5e5aec31c5369d8f283852b5f4b307bea6c4a29.zip
Make Lilv::uri_to_path static inline (fix #777).
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3583 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--ChangeLog1
-rw-r--r--lilv/lilvmm.hpp5
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 124a311..eb92f77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ lilv (UNRELEASED) unstable; urgency=low
* Use path variables in pkgconfig files
* Install man page to DATADIR (e.g. PREFIX/share/man, not PREFIX/man)
+ * Make Lilv::uri_to_path static inline (fix linking errors)
-- David Robillard <d@drobilla.net> (UNRELEASED)
diff --git a/lilv/lilvmm.hpp b/lilv/lilvmm.hpp
index 71f1a24..628941c 100644
--- a/lilv/lilvmm.hpp
+++ b/lilv/lilvmm.hpp
@@ -21,7 +21,10 @@
namespace Lilv {
-const char* uri_to_path(const char* uri) { return lilv_uri_to_path(uri); }
+static inline const char*
+uri_to_path(const char* uri) {
+ return lilv_uri_to_path(uri);
+}
#define LILV_WRAP0(RT, prefix, name) \
inline RT name() { return lilv_ ## prefix ## _ ## name (me); }