diff options
| author | Peter Johnson <peter@tortall.net> | 2012-08-30 23:40:42 -0700 |
|---|---|---|
| committer | Peter Johnson <peter@tortall.net> | 2012-08-30 23:40:42 -0700 |
| commit | 9728322335cba96500861ef766b1546d096e5600 (patch) | |
| tree | 5db30cc57e6a05b78581277f3d405ba48303e219 | |
| parent | 85f4120b6aa485a4a611a06adce8835e95bcb163 (diff) | |
| parent | 51b1f7ef98cdcea9cdb9d4cd613fbfae57828d32 (diff) | |
| download | yasm-9728322335cba96500861ef766b1546d096e5600.tar.gz | |
Merge pull request #64 from sgraham/fix-win32-warnings
Fix a couple warnings when building on win32
| -rw-r--r-- | modules/arch/x86/x86id.c | 2 | ||||
| -rw-r--r-- | modules/objfmts/elf/elf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/arch/x86/x86id.c b/modules/arch/x86/x86id.c index b07c9fc0..6207c206 100644 --- a/modules/arch/x86/x86id.c +++ b/modules/arch/x86/x86id.c @@ -643,7 +643,7 @@ x86_find_match(x86_id_insn *id_insn, yasm_insn_operand **ops, unsigned int misc_flags = info->misc_flags; unsigned int size; int mismatch = 0; - int i; + unsigned int i; /* Match CPU */ if (mode_bits != 64 && (misc_flags & ONLY_64)) diff --git a/modules/objfmts/elf/elf.c b/modules/objfmts/elf/elf.c index b9157812..7adf7ea9 100644 --- a/modules/objfmts/elf/elf.c +++ b/modules/objfmts/elf/elf.c @@ -98,7 +98,7 @@ elf_set_arch(yasm_arch *arch, yasm_symtab *symtab, int bits_pref) elf_march->ssyms[i].name, NULL, 0, 0); yasm_symrec_add_data(elf_ssyms[i], &elf_ssym_symrec_data, - &elf_march->ssyms[i]); + (void*)&elf_march->ssyms[i]); } } |