diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-03-17 20:46:25 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-03-17 20:46:51 -0500 |
| commit | 56b3e818912ac0ccc294efea6fca3a5d07d19fd6 (patch) | |
| tree | 4d5ba4cb36c507e220149d8f15625a17b912b0d9 /main/xulrunner/ipc-chromium-execinfo.patch | |
| parent | 0314b8125e186c9ec8cbacb8cf8c53ec32da5415 (diff) | |
| download | aports-56b3e818912ac0ccc294efea6fca3a5d07d19fd6.tar.bz2 aports-56b3e818912ac0ccc294efea6fca3a5d07d19fd6.tar.xz | |
main/xulrunner: upgrade to 2.0_rc1
Diffstat (limited to 'main/xulrunner/ipc-chromium-execinfo.patch')
| -rw-r--r-- | main/xulrunner/ipc-chromium-execinfo.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/main/xulrunner/ipc-chromium-execinfo.patch b/main/xulrunner/ipc-chromium-execinfo.patch index 48fc1c6a33..4bbc143d81 100644 --- a/main/xulrunner/ipc-chromium-execinfo.patch +++ b/main/xulrunner/ipc-chromium-execinfo.patch @@ -1,14 +1,14 @@ ---- mozilla-1.9.2.orig/ipc/chromium/src/base/debug_util_posix.cc -+++ mozilla-1.9.2/ipc/chromium/src/base/debug_util_posix.cc -@@ -6,7 +6,6 @@ - #include "base/debug_util.h" - - #include <errno.h> +--- mozilla-2.0.orig/ipc/chromium/src/base/debug_util_posix.cc ++++ mozilla-2.0/ipc/chromium/src/base/debug_util_posix.cc +@@ -12,7 +12,6 @@ + #include <sys/types.h> + #include <unistd.h> + #ifndef ANDROID -#include <execinfo.h> - #include <fcntl.h> - #include <stdio.h> - #include <sys/stat.h> -@@ -114,6 +113,7 @@ + #include <sys/sysctl.h> + #endif + +@@ -116,6 +115,7 @@ } StackTrace::StackTrace() { @@ -16,7 +16,7 @@ const int kMaxCallers = 256; void* callers[kMaxCallers]; -@@ -128,11 +128,14 @@ +@@ -134,12 +134,15 @@ } else { trace_.resize(0); } @@ -26,8 +26,9 @@ void StackTrace::PrintBacktrace() { +#if 0 fflush(stderr); + #ifndef ANDROID backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO); +#endif + #endif } - void StackTrace::OutputToStream(std::ostream* os) { |