Breakpad DWARF reader: Use uint64, not uint64_t in DWARF reader code.

The 64-bit cleanups made last month (http://breakpad.appspot.com/133001/show)
introduced unit test suite failures when built for a 32-bit architecture. The
fix for those test suite failures (http://breakpad.appspot.com/140001/show)
introduce build failures on Linux.

a=jimblandy


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@665 4c0a9323-5329-0410-9bdc-e9ce6186880e

2 files changed, 4 insertions, 4 deletions

diff --git a/src/common/dwarf/bytereader.cc b/src/common/dwarf/bytereader.cc
index fb0024d3..68020264 100644
--- a/src/common/dwarf/bytereader.cc
+++ b/src/common/dwarf/bytereader.cc
@@ -123,11 +123,11 @@ uint64 ByteReader::ReadEncodedPointer(const char *buffer,
 
     // First, find the offset to START from the closest prior aligned
     // address.
-    uint64_t skew = section_base_ & (AddressSize() - 1);
+    uint64 skew = section_base_ & (AddressSize() - 1);
     // Now find the offset from that aligned address to buffer.
-    uint64_t offset = skew + (buffer - buffer_base_);
+    uint64 offset = skew + (buffer - buffer_base_);
     // Round up to the next boundary.
-    uint64_t aligned = (offset + AddressSize() - 1) & -AddressSize();
+    uint64 aligned = (offset + AddressSize() - 1) & -AddressSize();
     // Convert back to a pointer.
     const char *aligned_buffer = buffer_base_ + (aligned - skew);
     // Finally, store the length and actually fetch the pointer.
diff --git a/src/common/dwarf/bytereader.h b/src/common/dwarf/bytereader.h
index 206b13a5..e3894273 100644
--- a/src/common/dwarf/bytereader.h
+++ b/src/common/dwarf/bytereader.h
@@ -301,7 +301,7 @@ class ByteReader {
   // Base addresses for Linux C++ exception handling data's encoded pointers.
   bool have_section_base_, have_text_base_, have_data_base_;
   bool have_function_base_;
-  uint64_t section_base_, text_base_, data_base_, function_base_;
+  uint64 section_base_, text_base_, data_base_, function_base_;
   const char *buffer_base_;
 };