diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-01 20:48:53 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:04 +0100 |
| commit | 206cf38d173e938a20bbee623af570db81e7ff8d (patch) | |
| tree | 3c252836cb98136447753260e0fb0c3ed4c7d8b3 /base | |
| parent | ddb351dbec246cf1fab5ec20d2d5520909041de1 (diff) | |
| download | external_chromium-206cf38d173e938a20bbee623af570db81e7ff8d.zip external_chromium-206cf38d173e938a20bbee623af570db81e7ff8d.tar.gz external_chromium-206cf38d173e938a20bbee623af570db81e7ff8d.tar.bz2 | |
Merge Chromium at r12.0.742.93: Fix misc conflicts
http://src.chromium.org/viewvc/chrome/branches/742/src/base/debug/stack_trace_posix.cc?r1=79524&r2=81601&pathrev=88489
Added const in stack_trace_posix.cc
http://codereview.chromium.org/6688056/
Updated DCHECK's in base, conflict in shared_memory_posix.cc
http://codereview.chromium.org/6673068
New NACL header file in base/third_party/nspr/, conflict in
prcpucfg.h
Change-Id: I656054ca3aae8dca9678c2455c7b7b90715514ff
Diffstat (limited to 'base')
| -rw-r--r-- | base/debug/stack_trace_posix.cc | 14 | ||||
| -rw-r--r-- | base/shared_memory_posix.cc | 7 | ||||
| -rw-r--r-- | base/third_party/nspr/prcpucfg.h | 6 |
3 files changed, 5 insertions, 22 deletions
diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc index 958cfdf..1f41113 100644 --- a/base/debug/stack_trace_posix.cc +++ b/base/debug/stack_trace_posix.cc @@ -169,16 +169,11 @@ StackTrace::StackTrace() { count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); } -<<<<<<< HEAD -void StackTrace::PrintBacktrace() { +void StackTrace::PrintBacktrace() const { #if (defined(OS_MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) || defined(ANDROID) #if defined(ANDROID) return; #else -======= -void StackTrace::PrintBacktrace() const { -#if defined(OS_MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 ->>>>>>> chromium.org at r12.0.742.93 if (backtrace_symbols_fd == NULL) return; #endif // ANDROID @@ -191,16 +186,11 @@ void StackTrace::PrintBacktrace() const { } } -<<<<<<< HEAD -void StackTrace::OutputToStream(std::ostream* os) { +void StackTrace::OutputToStream(std::ostream* os) const { #if (defined(OS_MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) || defined(ANDROID) #if defined(ANDROID) return; #else -======= -void StackTrace::OutputToStream(std::ostream* os) const { -#if defined(OS_MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 ->>>>>>> chromium.org at r12.0.742.93 if (backtrace_symbols == NULL) return; #endif // ANDROID diff --git a/base/shared_memory_posix.cc b/base/shared_memory_posix.cc index 682dc5c..c64e8e8 100644 --- a/base/shared_memory_posix.cc +++ b/base/shared_memory_posix.cc @@ -296,12 +296,9 @@ bool SharedMemory::FilePathForMemoryName(const std::string& mem_name, } void SharedMemory::LockOrUnlockCommon(int function) { -<<<<<<< HEAD - DCHECK(mapped_file_ >= 0); -#if !defined(ANDROID) -======= + DCHECK_GE(mapped_file_, 0); ->>>>>>> chromium.org at r12.0.742.93 +#if !defined(ANDROID) while (lockf(mapped_file_, function, 0) < 0) { if (errno == EINTR) { continue; diff --git a/base/third_party/nspr/prcpucfg.h b/base/third_party/nspr/prcpucfg.h index b5f0497..d6ebb47 100644 --- a/base/third_party/nspr/prcpucfg.h +++ b/base/third_party/nspr/prcpucfg.h @@ -34,13 +34,9 @@ #include "base/third_party/nspr/prcpucfg_win.h" #elif defined(__APPLE__) #include "base/third_party/nspr/prcpucfg_mac.h" -<<<<<<< HEAD -#elif defined(__linux__) || defined(__native_client__) || defined(ANDROID) -======= #elif defined(__native_client__) #include "base/third_party/nspr/prcpucfg_nacl.h" -#elif defined(__linux__) ->>>>>>> chromium.org at r12.0.742.93 +#elif defined(__linux__) || defined(ANDROID) #include "base/third_party/nspr/prcpucfg_linux.h" #elif defined(__FreeBSD__) #include "base/third_party/nspr/prcpucfg_freebsd.h" |