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/common/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/common/linux')
| -rw-r--r-- | src/common/linux/dump_symbols.cc | 2 | ||||
| -rw-r--r-- | src/common/linux/elfutils.h | 2 | ||||
| -rw-r--r-- | src/common/linux/file_id.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc index d029ca14..13a545f3 100644 --- a/src/common/linux/dump_symbols.cc +++ b/src/common/linux/dump_symbols.cc @@ -64,7 +64,7 @@ #include "common/linux/elfutils-inl.h" #include "common/linux/elf_symbols_to_module.h" #include "common/linux/file_id.h" -#include "common/memory.h" +#include "common/memory_allocator.h" #include "common/module.h" #include "common/scoped_ptr.h" #ifndef NO_STABS_SUPPORT diff --git a/src/common/linux/elfutils.h b/src/common/linux/elfutils.h index 3a77dd08..8fcb6a96 100644 --- a/src/common/linux/elfutils.h +++ b/src/common/linux/elfutils.h @@ -37,7 +37,7 @@ #include <link.h> #include <stdint.h> -#include "common/memory.h" +#include "common/memory_allocator.h" namespace google_breakpad { diff --git a/src/common/linux/file_id.h b/src/common/linux/file_id.h index 8ccbadd2..4aff021d 100644 --- a/src/common/linux/file_id.h +++ b/src/common/linux/file_id.h @@ -37,7 +37,7 @@ #include <string> #include "common/linux/guid_creator.h" -#include "common/memory.h" +#include "common/memory_allocator.h" #include "common/using_std_string.h" namespace google_breakpad { |