suyu/breakpad
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes up some style nits, and gets us compiling on Leopard again.

Browse source 
Review: http://breakpad.appspot.com/133001
BUG:none
TEST:Compile on Leopard



git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@631 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
dmaclach 2010-07-27 16:33:22 +00:00
parent 23eabdedab
commit a2d5da4831
4 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/dwarf/bytereader.cc
View file

@ -123,11 +123,11 @@ uint64 ByteReader::ReadEncodedPointer(const char *buffer,
// First, find the offset to START from the closest prior aligned // First, find the offset to START from the closest prior aligned
// address. // 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. // 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. // 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. // Convert back to a pointer.
const char *aligned_buffer = buffer_base_ + (aligned - skew); const char *aligned_buffer = buffer_base_ + (aligned - skew);
// Finally, store the length and actually fetch the pointer. // Finally, store the length and actually fetch the pointer.

2
src/common/dwarf/bytereader.h
View file

@ -301,7 +301,7 @@ class ByteReader {
// Base addresses for Linux C++ exception handling data's encoded pointers. // Base addresses for Linux C++ exception handling data's encoded pointers.
bool have_section_base_, have_text_base_, have_data_base_; bool have_section_base_, have_text_base_, have_data_base_;
bool have_function_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_; const char *buffer_base_;
}; };

4
src/common/module.h
View file

@ -269,12 +269,12 @@ class Module {
// A map from filenames to File structures. The map's keys are // A map from filenames to File structures. The map's keys are
// pointers to the Files' names. // pointers to the Files' names.
typedef map<const string *, File *, CompareStringPtrs> FileByNameMap; typedef map<const string *, File *, CompareStringPtrs> FileByNameMap;
typedef set<Function *, FunctionCompare> FunctionSet;
// The module owns all the files and functions that have been added // The module owns all the files and functions that have been added
// to it; destroying the module frees the Files and Functions these // to it; destroying the module frees the Files and Functions these
// point to. // point to.
FileByNameMap files_; // This module's source files. FileByNameMap files_; // This module's source files.
typedef set<Function *, FunctionCompare> FunctionSet;
FunctionSet functions_; // This module's functions. FunctionSet functions_; // This module's functions.
// The module owns all the call frame info entries that have been // The module owns all the call frame info entries that have been

7
src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
View file

@ -387,12 +387,6 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
_GLIBCXX_DEBUG_PEDANTIC,
_GLIBCXX_DEBUG,
_GLIBCPP_CONCEPT_CHECKS,
);
OTHER_LDFLAGS = "-lcrypto"; OTHER_LDFLAGS = "-lcrypto";
PRODUCT_NAME = crash_report; PRODUCT_NAME = crash_report;
USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)"; USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)";
@ -403,7 +397,6 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
OTHER_LDFLAGS = "-lcrypto"; OTHER_LDFLAGS = "-lcrypto";
PRODUCT_NAME = crash_report; PRODUCT_NAME = crash_report;
USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)"; USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)";