From 8bb3d55af734fd469213e0b88f5b5ad7ffec0abf Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Tue, 17 Oct 2017 10:02:23 -0400 Subject: 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 --- src/client/linux/dump_writer_common/thread_info.h | 2 +- src/client/linux/dump_writer_common/ucontext_reader.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client/linux/dump_writer_common') 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 #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 #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 { -- cgit v1.2.1