commit 51b1f7ef98cdcea9cdb9d4cd613fbfae57828d32
author Scott Graham <scottmg@chromium.org> Wed May 09 20:48:16 2012 -0700
committer Scott Graham <scottmg@chromium.org> Wed May 09 20:48:16 2012 -0700
tree d2c879c2a6aeea04105258ad3b195b056f367c0f
parent 82fafa7b5619e702c8681c959ade0746498e3cbc

fix a couple warnings when building on win32

modules/arch/x86/x86id.c

diff --git a/modules/arch/x86/x86id.c b/modules/arch/x86/x86id.c
index b07c9fc..6207c20 100644
--- a/modules/arch/x86/x86id.c
+++ b/modules/arch/x86/x86id.c
@@ -643,7 +643,7 @@
         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))

modules/objfmts/elf/elf.c

diff --git a/modules/objfmts/elf/elf.c b/modules/objfmts/elf/elf.c
index b915781..7adf7ea 100644
--- a/modules/objfmts/elf/elf.c
+++ b/modules/objfmts/elf/elf.c
@@ -98,7 +98,7 @@
                                                     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]);
         }
     }