commit c8f16f0c4c21e8eec8a106831c19e26c39e0376f
author Justin Cohen <justincohen@google.com> Thu May 20 09:45:54 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Thu May 20 08:04:16 2021 -0700
tree c053e024f549c8604f526afeb9047e9d688db7a1
parent 0928371b0610d2c8d884a177b09b8f5a805bf0f6

ios: Rename RAW_LOG to CRASHPAD_RAW_LOG.

Deconflict with chromium RAW_LOG.

Change-Id: I268dcbe90e80bbdb370f022129a196c6c363bc9d
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2910732
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
GitOrigin-RevId: 6f8dfc7730308ff141bbef6c0cb7291f74be2461

util/ios/raw_logging.h

diff --git a/util/ios/raw_logging.h b/util/ios/raw_logging.h
index 505aa67..6075281 100644
--- a/util/ios/raw_logging.h
+++ b/util/ios/raw_logging.h
@@ -28,10 +28,10 @@
 }  // 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_

util/ios/scoped_vm_read.cc

diff --git a/util/ios/scoped_vm_read.cc b/util/ios/scoped_vm_read.cc
index 33c2ad0..3bbc596 100644
--- a/util/ios/scoped_vm_read.cc
+++ b/util/ios/scoped_vm_read.cc
@@ -27,7 +27,7 @@
     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 @@
     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<vm_address_t>(data);
@@ -53,7 +53,7 @@
     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;
   }
 }