mirror of
https://git.suyu.dev/suyu/breakpad.git
synced 2026-01-01 12:14:56 +01:00
Funnel all bootstrap_register calls through a routine that doesn't care that
it's deprecated. Apple marked bootstrap_register as deprecated on 10.5 but it's actually still needed on that OS release. There isn't a way to get the functionality Breakpad needs from it without calling it until 10.6. Review URL: https://breakpad.appspot.com/350001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@921 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
parent
430c0a371a
commit
6fbc102794
6 changed files with 130 additions and 12 deletions
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
#import <stdio.h>
|
||||
#import "MachIPC.h"
|
||||
#include "common/mac/bootstrap_compat.h"
|
||||
|
||||
namespace google_breakpad {
|
||||
//==============================================================================
|
||||
|
|
@ -187,9 +188,10 @@ ReceivePort::ReceivePort(const char *receive_port_name) {
|
|||
if (init_result_ != KERN_SUCCESS)
|
||||
return;
|
||||
|
||||
init_result_ = bootstrap_register(bootstrap_port,
|
||||
const_cast<char*>(receive_port_name),
|
||||
port_);
|
||||
init_result_ = breakpad::BootstrapRegister(
|
||||
bootstrap_port,
|
||||
const_cast<char*>(receive_port_name),
|
||||
port_);
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
42
src/common/mac/bootstrap_compat.cc
Normal file
42
src/common/mac/bootstrap_compat.cc
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
// Copyright (c) 2012, Google Inc.
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include "common/mac/bootstrap_compat.h"
|
||||
|
||||
namespace breakpad {
|
||||
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
kern_return_t BootstrapRegister(mach_port_t bp,
|
||||
name_t service_name,
|
||||
mach_port_t sp) {
|
||||
return bootstrap_register(bp, service_name, sp);
|
||||
}
|
||||
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
|
||||
|
||||
} // namesapce breakpad
|
||||
54
src/common/mac/bootstrap_compat.h
Normal file
54
src/common/mac/bootstrap_compat.h
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
// Copyright (c) 2012, Google Inc.
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#ifndef COMMON_MAC_BOOTSTRAP_COMPAT_H_
|
||||
#define COMMON_MAC_BOOTSTRAP_COMPAT_H_
|
||||
|
||||
#include <servers/bootstrap.h>
|
||||
|
||||
namespace breakpad {
|
||||
|
||||
// Wrapper for bootstrap_register to avoid deprecation warnings.
|
||||
//
|
||||
// In 10.6, it's possible to call bootstrap_check_in as the one-stop-shop for
|
||||
// handling what bootstrap_register is used for. In 10.5, bootstrap_check_in
|
||||
// can't check in a service whose name has not yet been registered, despite
|
||||
// bootstrap_register being marked as deprecated in that OS release. Breakpad
|
||||
// needs to register new service names, and in 10.5, calling
|
||||
// bootstrap_register is the only way to achieve that. Attempts to call
|
||||
// bootstrap_check_in for a new service name on 10.5 will result in
|
||||
// BOOTSTRAP_UNKNOWN_SERVICE being returned rather than registration of the
|
||||
// new service name.
|
||||
kern_return_t BootstrapRegister(mach_port_t bp,
|
||||
name_t service_name,
|
||||
mach_port_t sp);
|
||||
|
||||
} // namespace breakpad
|
||||
|
||||
#endif // COMMON_MAC_BOOTSTRAP_COMPAT_H_
|
||||
Loading…
Add table
Add a link
Reference in a new issue