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 --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 6518cf98..e2443ddd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -478,7 +478,7 @@ src_client_linux_linux_client_unittest_shlib_SOURCES = \ src/common/linux/linux_libc_support_unittest.cc \ src/common/linux/tests/auto_testfile.h \ src/common/linux/tests/crash_generator.cc \ - src/common/memory_unittest.cc \ + src/common/memory_allocator_unittest.cc \ src/common/tests/auto_tempdir.h \ src/common/tests/file_utils.cc \ src/common/tests/file_utils.h \ -- cgit v1.2.3