| Index: handler/mac/exception_handler_server.cc
|
| diff --git a/handler/mac/exception_handler_server.cc b/handler/mac/exception_handler_server.cc
|
| index 803ebfdce1d74338bcd0e48e9cfa781349e61f5e..4d6373dd65751834e7e1c0b8f7df920344a3b116 100644
|
| --- a/handler/mac/exception_handler_server.cc
|
| +++ b/handler/mac/exception_handler_server.cc
|
| @@ -26,9 +26,8 @@ namespace crashpad {
|
|
|
| namespace {
|
|
|
| -class ExceptionHandlerServerRun
|
| - : public UniversalMachExcServer::Interface,
|
| - public NotifyServer::Interface {
|
| +class ExceptionHandlerServerRun : public UniversalMachExcServer::Interface,
|
| + public NotifyServer::Interface {
|
| public:
|
| ExceptionHandlerServerRun(
|
| mach_port_t exception_port,
|
| @@ -97,13 +96,14 @@ class ExceptionHandlerServerRun
|
| while (running_) {
|
| // This will result in a call to CatchMachException() or
|
| // DoMachNotifyNoSenders() as appropriate.
|
| - mach_msg_return_t mr =
|
| - MachMessageServer::Run(&composite_mach_message_server_,
|
| - server_port_set,
|
| - MACH_MSG_OPTION_NONE,
|
| - MachMessageServer::kOneShot,
|
| - MachMessageServer::kReceiveLargeIgnore,
|
| - kMachMessageTimeoutWaitIndefinitely);
|
| + mach_msg_return_t mr = MachMessageServer::Run(
|
| + &composite_mach_message_server_,
|
| + server_port_set,
|
| + MACH_RCV_TRAILER_TYPE(MACH_MSG_TRAILER_FORMAT_0) |
|
| + MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AUDIT),
|
| + MachMessageServer::kOneShot,
|
| + MachMessageServer::kReceiveLargeIgnore,
|
| + kMachMessageTimeoutWaitIndefinitely);
|
| MACH_CHECK(mr == MACH_MSG_SUCCESS, mr) << "MachMessageServer::Run";
|
| }
|
| }
|
| @@ -148,9 +148,9 @@ class ExceptionHandlerServerRun
|
| // NotifyServer::Interface:
|
|
|
| kern_return_t DoMachNotifyPortDeleted(
|
| - notify_port_t notify,
|
| - mach_port_name_t name,
|
| - const mach_msg_trailer_t* trailer) override {
|
| + notify_port_t notify,
|
| + mach_port_name_t name,
|
| + const mach_msg_trailer_t* trailer) override {
|
| return UnimplementedNotifyRoutine(notify);
|
| }
|
|
|
|
|