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>
This commit is contained in:
Ted Mielczarek 2017-10-17 10:02:23 -04:00
parent 3d6076efc2
commit 8bb3d55af7
15 changed files with 35 additions and 33 deletions

View file

@ -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

View file

@ -37,7 +37,7 @@
#include <link.h>
#include <stdint.h>
#include "common/memory.h"
#include "common/memory_allocator.h"
namespace google_breakpad {

View file

@ -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 {