Merge remote-tracking branch 'upstream/master' into change-handle-based-api

2015-08-30 00:02:33 -04:00
parent e74bc0db88 c23d387e2f
commit 3bd705a060
84 changed files with 5283 additions and 1274 deletions
--- a/regress/block_test.c
+++ b/regress/block_test.c
@ -39,7 +39,7 @@ int main() {
   }
   fprintf(stderr, "ok %d - uc_open\n", count++);

-   err = uc_mem_map(uc, 0x1000000, 4096);
+   err = uc_mem_map(uc, 0x1000000, 4096, UC_PROT_ALL);
   if (err != UC_ERR_OK) {
      fprintf(stderr, "not ok %d - %s\n", count++, uc_strerror(err));
      exit(0);