fix conflicts

9 years ago · caf8ddaae8
parent fe19541d7e
commit caf8ddaae8
2 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -90,7 +90,7 @@ xcode/Capstone.xcodeproj/project.xcworkspace/xcuserdata
 test_arm_regression
 test_arm_regression.o
 fuzz_harness
-fuzz_harness.o
+test_iter_benchmark


 *.s
--- a/suite/benchmark/test_iter_benchmark.c
+++ b/suite/benchmark/test_iter_benchmark.c
@ -78,7 +78,7 @@ static void test()
 	int maxcount = 10000000;
 	insn = cs_malloc(handle);
 	for (i = 0; i < maxcount;) {
-		code = X86_CODE32;
+		code = (const uint8_t *)X86_CODE32;
 		address = 0x1000;
 		size = sizeof(X86_CODE32) - 1;
 		while(cs_disasm_iter(handle, &code, &size, &address, insn)) {