summaryrefslogtreecommitdiffstats
path: root/src/zix/tree.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-01-17 02:13:19 +0000
committerDavid Robillard <d@drobilla.net>2012-01-17 02:13:19 +0000
commit33b20e5c20b0bbac5db9d8022ee5499b8cb95b5c (patch)
tree8017b89fe372677d21d73782ab0b2a6a4cdb99b6 /src/zix/tree.c
parent012e8a8785abcbf403d842d67303d7470b33694c (diff)
downloadlilv-33b20e5c20b0bbac5db9d8022ee5499b8cb95b5c.tar.gz
lilv-33b20e5c20b0bbac5db9d8022ee5499b8cb95b5c.tar.bz2
lilv-33b20e5c20b0bbac5db9d8022ee5499b8cb95b5c.zip
Support compilation as C++ under MSVC++,
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3955 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/zix/tree.c')
-rw-r--r--src/zix/tree.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/zix/tree.c b/src/zix/tree.c
index d22f438..39f3b36 100644
--- a/src/zix/tree.c
+++ b/src/zix/tree.c
@@ -15,7 +15,6 @@
*/
#include <assert.h>
-#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@ -74,7 +73,7 @@ zix_tree_new(bool allow_duplicates,
void* cmp_data,
ZixDestroyFunc destroy)
{
- ZixTree* t = malloc(sizeof(ZixTree));
+ ZixTree* t = (ZixTree*)malloc(sizeof(ZixTree));
t->root = NULL;
t->destroy = destroy;
t->cmp = cmp;
@@ -368,7 +367,7 @@ zix_tree_insert(ZixTree* t, void* e, ZixTreeIter** ti)
}
// Allocate a new node n
- if (!(n = malloc(sizeof(ZixTreeNode)))) {
+ if (!(n = (ZixTreeNode*)malloc(sizeof(ZixTreeNode)))) {
return ZIX_STATUS_NO_MEM;
}
memset(n, '\0', sizeof(ZixTreeNode));