diff options
| author | Ted Mielczarek <ted@mielczarek.org> | 2017-10-17 10:02:23 -0400 |
|---|---|---|
| committer | Ted Mielczarek <ted@mielczarek.org> | 2017-10-17 14:02:43 +0000 |
| commit | 8bb3d55af734fd469213e0b88f5b5ad7ffec0abf (patch) | |
| tree | 9a955bcf911366a4358070460de98aec186e58d6 /src/client/linux | |
| parent | Add -s flag to microdump_stackwalk for dumping stack contents. (diff) | |
| download | breakpad-8bb3d55af734fd469213e0b88f5b5ad7ffec0abf.tar.xz | |
Rename src/common/memory.h to memory_allocator.h.
memory.h shadows a system header which normally isn't a problem
because of the include paths in Breakpad, but the Firefox build
system winds up with src/common in the include path so we've had
a workaround for this for years. Renaming the file lets us get
rid of that workaround and shouldn't hurt anything.
Change-Id: I3b7c4239dc77f3b2b7cf2b572a0cad88cd7e8522
Reviewed-on: https://chromium-review.googlesource.com/723261
Reviewed-by: Mark Mentovai <mark@chromium.org>
Diffstat (limited to 'src/client/linux')
6 files changed, 6 insertions, 6 deletions
diff --git a/src/client/linux/dump_writer_common/thread_info.h b/src/client/linux/dump_writer_common/thread_info.h index 99093d2e..fb216fa6 100644 --- a/src/client/linux/dump_writer_common/thread_info.h +++ b/src/client/linux/dump_writer_common/thread_info.h @@ -34,7 +34,7 @@ #include <sys/user.h> #include "client/linux/dump_writer_common/raw_context_cpu.h" -#include "common/memory.h" +#include "common/memory_allocator.h" #include "google_breakpad/common/minidump_format.h" namespace google_breakpad { diff --git a/src/client/linux/dump_writer_common/ucontext_reader.h b/src/client/linux/dump_writer_common/ucontext_reader.h index 2de80b70..f830618f 100644 --- a/src/client/linux/dump_writer_common/ucontext_reader.h +++ b/src/client/linux/dump_writer_common/ucontext_reader.h @@ -34,7 +34,7 @@ #include <sys/user.h> #include "client/linux/dump_writer_common/raw_context_cpu.h" -#include "common/memory.h" +#include "common/memory_allocator.h" #include "google_breakpad/common/minidump_format.h" namespace google_breakpad { diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc index 05936d28..95005209 100644 --- a/src/client/linux/handler/exception_handler.cc +++ b/src/client/linux/handler/exception_handler.cc @@ -89,7 +89,7 @@ #include "common/basictypes.h" #include "common/linux/linux_libc_support.h" -#include "common/memory.h" +#include "common/memory_allocator.h" #include "client/linux/log/log.h" #include "client/linux/microdump_writer/microdump_writer.h" #include "client/linux/minidump_writer/linux_dumper.h" diff --git a/src/client/linux/microdump_writer/microdump_writer.cc b/src/client/linux/microdump_writer/microdump_writer.cc index 41dc4504..180873f4 100644 --- a/src/client/linux/microdump_writer/microdump_writer.cc +++ b/src/client/linux/microdump_writer/microdump_writer.cc @@ -44,7 +44,7 @@ #include "client/linux/minidump_writer/linux_ptrace_dumper.h" #include "common/linux/file_id.h" #include "common/linux/linux_libc_support.h" -#include "common/memory.h" +#include "common/memory_allocator.h" namespace { diff --git a/src/client/linux/minidump_writer/linux_dumper.h b/src/client/linux/minidump_writer/linux_dumper.h index 389d8a21..4a4e0b0a 100644 --- a/src/client/linux/minidump_writer/linux_dumper.h +++ b/src/client/linux/minidump_writer/linux_dumper.h @@ -50,7 +50,7 @@ #include "client/linux/dump_writer_common/mapping_info.h" #include "client/linux/dump_writer_common/thread_info.h" #include "common/linux/file_id.h" -#include "common/memory.h" +#include "common/memory_allocator.h" #include "google_breakpad/common/minidump_format.h" namespace google_breakpad { diff --git a/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc b/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc index 2ef1c494..a4a0fd9b 100644 --- a/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +++ b/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc @@ -55,7 +55,7 @@ #include "common/linux/file_id.h" #include "common/linux/ignore_ret.h" #include "common/linux/safe_readlink.h" -#include "common/memory.h" +#include "common/memory_allocator.h" #include "common/using_std_string.h" #ifndef PR_SET_PTRACER |