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/mac | |
| 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/mac')
| -rw-r--r-- | src/client/mac/handler/minidump_generator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/mac/handler/minidump_generator.h b/src/client/mac/handler/minidump_generator.h index 4e4b4a68..d943f56a 100644 --- a/src/client/mac/handler/minidump_generator.h +++ b/src/client/mac/handler/minidump_generator.h @@ -39,7 +39,7 @@ #include "client/mac/handler/ucontext_compat.h" #include "client/minidump_file_writer.h" -#include "common/memory.h" +#include "common/memory_allocator.h" #include "common/mac/macho_utilities.h" #include "google_breakpad/common/minidump_format.h" |