Merge branch 'master' into msvc2

This commit is contained in:
Nguyen Anh Quynh
2017-04-21 01:17:00 +08:00
16 changed files with 54 additions and 19 deletions

View File

@ -60,8 +60,6 @@ typedef int (*uc_args_int_uc_t)(struct uc_struct*);
typedef bool (*uc_args_tcg_enable_t)(struct uc_struct*);
typedef void (*uc_minit_t)(struct uc_struct*, ram_addr_t);
typedef void (*uc_args_uc_long_t)(struct uc_struct*, unsigned long);
typedef void (*uc_args_uc_u64_t)(struct uc_struct *, uint64_t addr);

View File

@ -68,7 +68,7 @@ typedef size_t uc_hook;
// Unicorn package version
#define UC_VERSION_MAJOR UC_API_MAJOR
#define UC_VERSION_MINOR UC_API_MINOR
#define UC_VERSION_EXTRA 0
#define UC_VERSION_EXTRA 1
/*