summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-10-03 17:32:14 +0000
committerDavid Robillard <d@drobilla.net>2014-10-03 17:32:14 +0000
commit577ac66a5905f16934892ca3df995b590d06ba34 (patch)
treee8b91f873870b97f4f0d77fd11ee6b54da5c1eb2
parent4fb26e010d14849bd61279cbf7be82035244a8c9 (diff)
downloadsord-577ac66a5905f16934892ca3df995b590d06ba34.tar.gz
sord-577ac66a5905f16934892ca3df995b590d06ba34.tar.bz2
sord-577ac66a5905f16934892ca3df995b590d06ba34.zip
Compile cleanly as C++.
git-svn-id: http://svn.drobilla.net/sord/trunk@314 3d64ff67-21c5-427c-a301-fe4f08042e5a
-rw-r--r--src/sord_validate.c2
-rw-r--r--src/zix/btree.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sord_validate.c b/src/sord_validate.c
index 7c44941..ad62d6f 100644
--- a/src/sord_validate.c
+++ b/src/sord_validate.c
@@ -165,7 +165,7 @@ regexp_match(const uint8_t* pat, const char* str)
#ifdef HAVE_PCRE
// Append a $ to the pattern so we only match if the entire string matches
const size_t len = strlen((const char*)pat);
- char* const regx = malloc(len + 2);
+ char* const regx = (char*)malloc(len + 2);
memcpy(regx, pat, len);
regx[len] = '$';
regx[len + 1] = '\0';
diff --git a/src/zix/btree.c b/src/zix/btree.c
index e7912d0..82a7955 100644
--- a/src/zix/btree.c
+++ b/src/zix/btree.c
@@ -358,7 +358,7 @@ zix_btree_rotate_left(ZixBTreeNode* const parent, const uint16_t i)
// Move first child pointer from RHS to end of LHS
if (!lhs->is_leaf) {
- lhs->children[lhs->n_vals] = zix_btree_aerase(
+ lhs->children[lhs->n_vals] = (ZixBTreeNode*)zix_btree_aerase(
(void**)rhs->children, rhs->n_vals, 0);
}