diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:21:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:21:13 +0200 |
| commit | f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c (patch) | |
| tree | 50b3bae39301c2ef89bbbabdb843a62d679e034e /package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc | |
| parent | c2bd3a43342e37a05a97e12581dd2bd52993877a (diff) | |
I am to tupid for git, today.
Revert "Revert "fix conflict, autoseect libgcj""
This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
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, 0 insertions, 29 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 deleted file mode 100644 index 833e94185..000000000 --- a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc +++ /dev/null @@ -1,29 +0,0 @@ ---- 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) { |