diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:20:09 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:20:09 +0200 |
commit | c2bd3a43342e37a05a97e12581dd2bd52993877a (patch) | |
tree | 39f9427d581669d8f619b4df44c5c5548c8fd955 /package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc | |
parent | ac46bdeef28bc2b65e1880884a79257c28e423a7 (diff) |
Revert "fix conflict, autoseect libgcj"
This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
Diffstat (limited to 'package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc')
-rw-r--r-- | package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc new file mode 100644 index 000000000..833e94185 --- /dev/null +++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc @@ -0,0 +1,29 @@ +--- mozilla-1.9.2.orig/ipc/chromium/src/base/debug_util_posix.cc 2010-10-27 05:01:17.000000000 +0200 ++++ mozilla-1.9.2/ipc/chromium/src/base/debug_util_posix.cc 2010-11-12 11:53:10.614327269 +0100 +@@ -114,6 +114,9 @@ void DebugUtil::BreakDebugger() { + } + + StackTrace::StackTrace() { ++#ifdef CHROMIUM_MOZILLA_BUILD ++ return; ++#else + const int kMaxCallers = 256; + + void* callers[kMaxCallers]; +@@ -128,11 +131,16 @@ StackTrace::StackTrace() { + } else { + trace_.resize(0); + } ++#endif + } + + void StackTrace::PrintBacktrace() { ++#ifdef CHROMIUM_MOZILLA_BUILD ++ return; ++#else + fflush(stderr); + backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO); ++#endif + } + + void StackTrace::OutputToStream(std::ostream* os) { |