Even more Mac build fixes.

The stack one is a punt until I've got an actual machine to test on.

Change-Id: Ibb2132511f4c9f50f1f21651ca9ba7d5bed67e09
diff --git a/src/stack.h b/src/stack.h
index 868b157..3a0903f 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -61,7 +61,7 @@
   uint32_t GetVReg(const DexFile::CodeItem* code_item, uint32_t core_spills, uint32_t fp_spills,
                     size_t frame_size, int vreg) const;
 
-  uintptr_t GetVReg(Method* m, int vreg) const;
+  uint32_t GetVReg(Method* m, int vreg) const;
   void SetVReg(Method* method, int vreg, uint32_t new_value);
 
   Method** GetSP() const {