commit e689d51969fe1ab682a6a937973ec1e16ea8adcb
author Elliott Hughes <enh@google.com> Wed Jan 18 23:39:47 2012 -0800
committer Elliott Hughes <enh@google.com> Wed Jan 18 23:39:47 2012 -0800
tree 6da90cfbb361c8a586c2c89db57ad24e9f33bd6a
parent d77fd720a406335f896374b8c64174cd8756aad6

Still more Mac build fixes.

Change-Id: I7872726dfdc308e3baed86f13e780b83f23c3b4a

src/oat_file.cc

diff --git a/src/oat_file.cc b/src/oat_file.cc
index 6ffcb52..bd108eb 100644
--- a/src/oat_file.cc
+++ b/src/oat_file.cc
@@ -69,7 +69,7 @@
           << filename << " " << reinterpret_cast<void*>(map->GetAddress());
   DCHECK_EQ(0, memcmp(&oat_header, map->GetAddress(), sizeof(OatHeader))) << filename;
 
-  off64_t code_offset = oat_header.GetExecutableOffset();
+  off_t code_offset = oat_header.GetExecutableOffset();
   if (code_offset < file->Length()) {
     byte* code_address = map->GetAddress() + code_offset;
     size_t code_length = file->Length() - code_offset;

src/object.cc

diff --git a/src/object.cc b/src/object.cc
index 02bf355..456df7c 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -637,23 +637,23 @@
     for (size_t i = 0; i < kh.NumInterfaces(); ++i) {
       Class* interface = kh.GetInterface(i);
       const ClassLoader* cl = interface->GetClassLoader();
-      os << StringPrintf("    %2d: %s (cl=%p)\n", i, PrettyClass(interface).c_str(), cl);
+      os << StringPrintf("    %2zd: %s (cl=%p)\n", i, PrettyClass(interface).c_str(), cl);
     }
   }
   os << "  vtable (" << NumVirtualMethods() << " entries, "
      << (super != NULL ? super->NumVirtualMethods() : 0) << " in super):\n";
   for (size_t i = 0; i < NumVirtualMethods(); ++i) {
-    os << StringPrintf("    %2d: %s\n", i, PrettyMethod(GetVirtualMethodDuringLinking(i)).c_str());
+    os << StringPrintf("    %2zd: %s\n", i, PrettyMethod(GetVirtualMethodDuringLinking(i)).c_str());
   }
   os << "  direct methods (" << NumDirectMethods() << " entries):\n";
   for (size_t i = 0; i < NumDirectMethods(); ++i) {
-    os << StringPrintf("    %2d: %s\n", i, PrettyMethod(GetDirectMethod(i)).c_str());
+    os << StringPrintf("    %2zd: %s\n", i, PrettyMethod(GetDirectMethod(i)).c_str());
   }
   if (NumStaticFields() > 0) {
     os << "  static fields (" << NumStaticFields() << " entries):\n";
     if (IsResolved() || IsErroneous()) {
       for (size_t i = 0; i < NumStaticFields(); ++i) {
-        os << StringPrintf("    %2d: %s\n", i, PrettyField(GetStaticField(i)).c_str());
+        os << StringPrintf("    %2zd: %s\n", i, PrettyField(GetStaticField(i)).c_str());
       }
     } else {
       os << "    <not yet available>";
@@ -663,7 +663,7 @@
     os << "  instance fields (" << NumInstanceFields() << " entries):\n";
     if (IsResolved() || IsErroneous()) {
       for (size_t i = 0; i < NumInstanceFields(); ++i) {
-        os << StringPrintf("    %2d: %s\n", i, PrettyField(GetInstanceField(i)).c_str());
+        os << StringPrintf("    %2zd: %s\n", i, PrettyField(GetInstanceField(i)).c_str());
       }
     } else {
       os << "    <not yet available>";
@@ -1023,7 +1023,7 @@
   size_t component_shift = sizeof(size_t) * 8 - 1 - CLZ(component_size);
   if (data_size >> component_shift != size_t(component_count) || size < data_size) {
     Thread::Current()->ThrowNewExceptionF("Ljava/lang/OutOfMemoryError;",
-        "%s of length %zd exceeds the VM limit",
+        "%s of length %d exceeds the VM limit",
         PrettyDescriptor(array_class).c_str(), component_count);
     return NULL;
   }