4 files changed, 16 insertions, 14 deletions
diff --git a/test/btree_test.c b/test/btree_test.c
index 1b900fe..8d687dc 100644
--- a/test/btree_test.c
+++ b/test/btree_test.c
@@ -452,7 +452,7 @@ main(int argc, char** argv)
 	}
 
 	const unsigned n_tests = 3;
-	unsigned       n_elems = (argc > 1) ? atol(argv[1]) : 524288U;
+	unsigned       n_elems = (argc > 1) ? (unsigned)atol(argv[1]) : 524288u;
 
 	printf("Running %u tests with %u elements", n_tests, n_elems);
 	for (unsigned i = 0; i < n_tests; ++i) {
diff --git a/test/sorted_array_test.c b/test/sorted_array_test.c
index ca4eac7..30ff139 100644
--- a/test/sorted_array_test.c
+++ b/test/sorted_array_test.c
@@ -36,7 +36,8 @@ int_cmp(const void* a, const void* b, const void* ZIX_UNUSED(user_data))
 {
 	const intptr_t ia = *(const intptr_t*)a;
 	const intptr_t ib = *(const intptr_t*)b;
-	return ia - ib;
+
+	return ia < ib ? -1 : ia > ib ? 1 : 0;
 }
 
 static intptr_t
@@ -152,11 +153,11 @@ main(int argc, char** argv)
 	if (argc == 1) {
 		n_elems = 4096;
 	} else {
-		n_elems = atol(argv[1]);
+		n_elems = (unsigned)atol(argv[1]);
 		if (argc > 2) {
-			seed = atol(argv[2]);
+			seed = (unsigned)atol(argv[2]);
 		} else {
-			seed = time(NULL);
+			seed = (unsigned)time(NULL);
 		}
 	}
 
diff --git a/test/tree_bench.c b/test/tree_bench.c
index 3a7e601..9e58c8d 100644
--- a/test/tree_bench.c
+++ b/test/tree_bench.c
@@ -30,17 +30,17 @@
 // #define BENCH_SORTED_ARRAY 1
 
 // Return a pseudo-pseudo-pseudo-random-ish integer with no duplicates
-static uint32_t
-unique_rand(uint32_t i)
+static size_t
+unique_rand(size_t i)
 {
 	i ^= 0x5CA1AB1E;  // Juggle bits to avoid linear clumps
 
 	// Largest prime < 2^32 which satisfies (2^32 = 3 mod 4)
-	static const uint32_t prime = 4294967291;
+	static const size_t prime = 4294967291;
 	if (i >= prime) {
 		return i;  // Values >= prime are mapped to themselves
 	} else {
-		const uint32_t residue = ((uint64_t)i * i) % prime;
+		const size_t residue = ((uint64_t)i * i) % prime;
 		return (i <= prime / 2) ? residue : prime - residue;
 	}
 }
diff --git a/test/tree_test.c b/test/tree_test.c
index 1aebb50..5331344 100644
--- a/test/tree_test.c
+++ b/test/tree_test.c
@@ -37,11 +37,12 @@ int_cmp(const void* a, const void* b, const void* ZIX_UNUSED(user_data))
 {
 	const intptr_t ia = (intptr_t)a;
 	const intptr_t ib = (intptr_t)b;
-	return ia - ib;
+
+	return ia < ib ? -1 : ia > ib ? 1 : 0;
 }
 
 static uintptr_t
-ith_elem(int test_num, size_t n_elems, int i)
+ith_elem(int test_num, size_t n_elems, size_t i)
 {
 	switch (test_num % 3) {
 	case 0:
@@ -203,11 +204,11 @@ main(int argc, char** argv)
 	if (argc == 1) {
 		n_elems = 100000;
 	} else {
-		n_elems = atol(argv[1]);
+		n_elems = (unsigned)atol(argv[1]);
 		if (argc > 2) {
-			seed = atol(argv[2]);
+			seed = (unsigned)atol(argv[2]);
 		} else {
-			seed = time(NULL);
+			seed = (unsigned)time(NULL);
 		}
 	}