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/common.gyp | |
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/common.gyp')
-rw-r--r-- | src/common/common.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/common.gyp b/src/common/common.gyp index 1c97bfc9..9cc90f84 100644 --- a/src/common/common.gyp +++ b/src/common/common.gyp @@ -151,7 +151,7 @@ 'mac/super_fat_arch.h', 'md5.cc', 'md5.h', - 'memory.h', + 'memory_allocator.h', 'memory_range.h', 'module.cc', 'module.h', @@ -221,8 +221,8 @@ 'linux/tests/crash_generator.cc', 'linux/tests/crash_generator.h', 'mac/macho_reader_unittest.cc', + 'memory_allocator_unittest.cc', 'memory_range_unittest.cc', - 'memory_unittest.cc', 'module_unittest.cc', 'simple_string_dictionary_unittest.cc', 'stabs_reader_unittest.cc', |