--- libmalloc/libmalloc-474.0.13/tests/xctests/malloc_mocks.c
+++ libmalloc/libmalloc-792.80.2/tests/xctests/malloc_mocks.c
@@ -6,7 +6,7 @@
 
 malloc_zero_policy_t malloc_zero_policy = MALLOC_ZERO_POLICY_DEFAULT;
 unsigned malloc_zero_on_free_sample_period = 0;
-#if CONFIG_MAGAZINE_PER_CLUSTER
+#if CONFIG_CLUSTER_AWARE
 unsigned int ncpuclusters = 1;
 #endif
 
@@ -31,7 +31,7 @@
 		__builtin_trap();
 	}
 
-	longjmp(zone_error_expected_jmp, 1);
+	longjmp(*zone_error_expected_jmp, 1);
 }
 
 void