diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 00:16:19 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 00:16:19 +0000 |
| commit | bed545eabecccf7e92b476e5f638732ffb1f2038 (patch) | |
| tree | 9d8a743ba28abefc723efdc0674fd6d03231665c /base | |
| parent | 2f7e359cd8efd9f457c421c73d470a574ca2da57 (diff) | |
| download | chromium_src-bed545eabecccf7e92b476e5f638732ffb1f2038.zip chromium_src-bed545eabecccf7e92b476e5f638732ffb1f2038.tar.gz chromium_src-bed545eabecccf7e92b476e5f638732ffb1f2038.tar.bz2 | |
Remove compat_execinfo since we no longer support Mac 10.4.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6033008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/compat_execinfo.h | 34 | ||||
| -rw-r--r-- | base/debug/debugger_posix.cc | 2 | ||||
| -rw-r--r-- | base/debug/stack_trace_posix.cc | 2 |
3 files changed, 2 insertions, 36 deletions
diff --git a/base/compat_execinfo.h b/base/compat_execinfo.h deleted file mode 100644 index 3d4cc43..0000000 --- a/base/compat_execinfo.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// A file you can include instead of <execinfo.h> if your project might need -// to run on Mac OS X 10.4. - -#ifndef BASE_COMPAT_EXECINFO_H_ -#define BASE_COMPAT_EXECINFO_H_ -#pragma once - -#include "build/build_config.h" - -#if defined(OS_MACOSX) -#include <AvailabilityMacros.h> -#endif - -#if defined(OS_MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 -// Manually define these here as weak imports, rather than including execinfo.h. -// This lets us launch on 10.4 which does not have these calls. -extern "C" { - -extern int backtrace(void**, int) __attribute__((weak_import)); -extern char** backtrace_symbols(void* const*, int) - __attribute__((weak_import)); -extern void backtrace_symbols_fd(void* const*, int, int) - __attribute__((weak_import)); - -} // extern "C" -#else -#include <execinfo.h> -#endif - -#endif // BASE_COMPAT_EXECINFO_H_ diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc index 1e0c2ba..ffa4670d 100644 --- a/base/debug/debugger_posix.cc +++ b/base/debug/debugger_posix.cc @@ -6,6 +6,7 @@ #include "build/build_config.h" #include <errno.h> +#include <execinfo.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> @@ -30,7 +31,6 @@ #include <iostream> #include "base/basictypes.h" -#include "base/compat_execinfo.h" #include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/safe_strerror_posix.h" diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc index a9f0a39..abbd642 100644 --- a/base/debug/stack_trace_posix.cc +++ b/base/debug/stack_trace_posix.cc @@ -5,6 +5,7 @@ #include "base/debug/stack_trace.h" #include <errno.h> +#include <execinfo.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> @@ -27,7 +28,6 @@ #include <iostream> #include "base/basictypes.h" -#include "base/compat_execinfo.h" #include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/safe_strerror_posix.h" |