aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/dwarf/bytereader.cc6
-rw-r--r--src/common/dwarf/bytereader.h2
-rw-r--r--src/common/module.h4
-rw-r--r--src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj7
4 files changed, 6 insertions, 13 deletions
diff --git a/src/common/dwarf/bytereader.cc b/src/common/dwarf/bytereader.cc
index 95193834..8721b7a5 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);
+ size_t skew = section_base_ & (AddressSize() - 1);
// Now find the offset from that aligned address to buffer.
- uint64_t offset = skew + (buffer - buffer_base_);
+ off_t offset = skew + (buffer - buffer_base_);
// Round up to the next boundary.
- uint64_t aligned = (offset + AddressSize() - 1) & -AddressSize();
+ size_t 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 aaa97c4f..f01f319d 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 section_base_, text_base_, data_base_, function_base_;
+ size_t section_base_, text_base_, data_base_, function_base_;
const char *buffer_base_;
};
diff --git a/src/common/module.h b/src/common/module.h
index 8aea99f8..8c20cea0 100644
--- a/src/common/module.h
+++ b/src/common/module.h
@@ -269,12 +269,12 @@ class Module {
// A map from filenames to File structures. The map's keys are
// pointers to the Files' names.
typedef map<const string *, File *, CompareStringPtrs> FileByNameMap;
+ typedef set<Function *, FunctionCompare> FunctionSet;
// The module owns all the files and functions that have been added
// to it; destroying the module frees the Files and Functions these
// point to.
- FileByNameMap files_; // This module's source files.
- typedef set<Function *, FunctionCompare> FunctionSet;
+ FileByNameMap files_; // This module's source files.
FunctionSet functions_; // This module's functions.
// The module owns all the call frame info entries that have been
diff --git a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
index 7ff11601..d3d756b1 100644
--- a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
+++ b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
@@ -387,12 +387,6 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "$(inherited)",
- _GLIBCXX_DEBUG_PEDANTIC,
- _GLIBCXX_DEBUG,
- _GLIBCPP_CONCEPT_CHECKS,
- );
OTHER_LDFLAGS = "-lcrypto";
PRODUCT_NAME = crash_report;
USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)";
@@ -403,7 +397,6 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
OTHER_LDFLAGS = "-lcrypto";
PRODUCT_NAME = crash_report;
USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)";