Bug 1511140 - Declare PRINT_MACH_RESULT only once r=Ehsan
authorSylvestre Ledru <sledru@mozilla.com>
Thu, 29 Nov 2018 20:21:29 +0000
changeset 448852 982d3f5bc88baf588df2ed03c8a7f6f34b3b4a74
parent 448851 55abd0f51161498eaa0c5a875895a54179c52b73
child 448853 88f8e61c7b04acfb705448f02851b0c17ca470db
push id35129
push usernerli@mozilla.com
push dateFri, 30 Nov 2018 09:34:14 +0000
treeherdermozilla-central@c5b713000513 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersEhsan
bugs1511140
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1511140 - Declare PRINT_MACH_RESULT only once r=Ehsan Differential Revision: https://phabricator.services.mozilla.com/D13458
ipc/chromium/src/chrome/common/mach_ipc_mac.h
toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.h
--- a/ipc/chromium/src/chrome/common/mach_ipc_mac.h
+++ b/ipc/chromium/src/chrome/common/mach_ipc_mac.h
@@ -62,18 +62,20 @@
 //    message.AddDescriptor(mach_thread_self());   // this thread
 //
 //    char messageString[] = "Hello server!\n";
 //    message.SetData(messageString, strlen(messageString)+1);
 //    // timeout 1000ms
 //    kern_return_t result = sender.SendMessage(message, 1000);
 //
 
+#ifndef PRINT_MACH_RESULT
 #define PRINT_MACH_RESULT(result_, message_) \
   printf(message_" %s (%d)\n", mach_error_string(result_), result_ );
+#endif
 
 //==============================================================================
 // A wrapper class for mach_msg_port_descriptor_t (with same memory layout)
 // with convenient constructors and accessors
 class MachMsgPortDescriptor : public mach_msg_port_descriptor_t {
  public:
   // General-purpose constructor
   MachMsgPortDescriptor(mach_port_t in_name,
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.h
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.h
@@ -90,18 +90,20 @@
 //
 //    char messageString[] = "Hello server!\n";
 //    message.SetData(messageString, strlen(messageString)+1);
 //
 //    kern_return_t result = sender.SendMessage(message, 1000); // timeout 1000ms
 //
 
 namespace google_breakpad {
+#ifndef PRINT_MACH_RESULT
 #define PRINT_MACH_RESULT(result_, message_) \
   printf(message_" %s (%d)\n", mach_error_string(result_), result_ );
+#endif
 
 //==============================================================================
 // A wrapper class for mach_msg_port_descriptor_t (with same memory layout)
 // with convenient constructors and accessors
 class MachMsgPortDescriptor : public mach_msg_port_descriptor_t {
  public:
   // General-purpose constructor
   MachMsgPortDescriptor(mach_port_t in_name,