diff --git a/util/ios/raw_logging.h b/util/ios/raw_logging.h index 505aa671..60752817 100644 --- a/util/ios/raw_logging.h +++ b/util/ios/raw_logging.h @@ -28,10 +28,10 @@ void RawLog(const char* file, int line, const char* message, int error); } // namespace internal } // namespace crashpad -#define RAW_LOG(message) \ +#define CRASHPAD_RAW_LOG(message) \ ::crashpad::internal::RawLog(__FILE__, __LINE__, message, 0) -#define RAW_LOG_ERROR(error, message) \ +#define CRASHPAD_RAW_LOG_ERROR(error, message) \ ::crashpad::internal::RawLog(__FILE__, __LINE__, message, error) #endif // CRASHPAD_UTIL_IOS_EXCEPTION_LOGGING_H_ diff --git a/util/ios/scoped_vm_read.cc b/util/ios/scoped_vm_read.cc index 33c2ad05..3bbc5968 100644 --- a/util/ios/scoped_vm_read.cc +++ b/util/ios/scoped_vm_read.cc @@ -27,7 +27,7 @@ ScopedVMReadInternal::~ScopedVMReadInternal() { kern_return_t kr = vm_deallocate(mach_task_self(), vm_read_data_, vm_read_data_count_); if (kr != KERN_SUCCESS) - RAW_LOG_ERROR(kr, "vm_deallocate"); + CRASHPAD_RAW_LOG_ERROR(kr, "vm_deallocate"); } } @@ -36,7 +36,7 @@ bool ScopedVMReadInternal::Read(const void* data, const size_t data_length) { kern_return_t kr = vm_deallocate(mach_task_self(), vm_read_data_, vm_read_data_count_); if (kr != KERN_SUCCESS) - RAW_LOG_ERROR(kr, "vm_deallocate"); + CRASHPAD_RAW_LOG_ERROR(kr, "vm_deallocate"); data_ = 0; } vm_address_t data_address = reinterpret_cast(data); @@ -53,7 +53,7 @@ bool ScopedVMReadInternal::Read(const void* data, const size_t data_length) { data_ = vm_read_data_ + (data_address - page_region_address); return true; } else { - RAW_LOG_ERROR(kr, "vm_read"); + CRASHPAD_RAW_LOG_ERROR(kr, "vm_read"); return false; } }