Commit 63867eea authored by sgjesse@chromium.org's avatar sgjesse@chromium.org

Rename memory.h to v8memory.h

This is to avoid name collision with system include file named memory.h causing problems on some platforms.
Review URL: http://codereview.chromium.org/6716020

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7301 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 4a2639e7
......@@ -28,8 +28,6 @@
#ifndef V8_ARM_FRAMES_ARM_H_
#define V8_ARM_FRAMES_ARM_H_
#include "memory.h"
namespace v8 {
namespace internal {
......
......@@ -29,8 +29,8 @@
#define V8_FRAMES_INL_H_
#include "frames.h"
#include "isolate.h"
#include "v8memory.h"
#if V8_TARGET_ARCH_IA32
#include "ia32/frames-ia32.h"
......
......@@ -28,8 +28,6 @@
#ifndef V8_IA32_FRAMES_IA32_H_
#define V8_IA32_FRAMES_IA32_H_
#include "memory.h"
namespace v8 {
namespace internal {
......
......@@ -35,10 +35,10 @@
#include "debug.h"
#include "deoptimizer.h"
#include "global-handles.h"
#include "memory.h"
#include "parser.h"
#include "scopeinfo.h"
#include "scopes.h"
#include "v8memory.h"
namespace v8 {
namespace internal {
......
......@@ -39,10 +39,10 @@
#include "contexts.h"
#include "conversions-inl.h"
#include "heap.h"
#include "memory.h"
#include "isolate.h"
#include "property.h"
#include "spaces.h"
#include "v8memory.h"
namespace v8 {
namespace internal {
......
......@@ -29,8 +29,8 @@
#define V8_SPACES_INL_H_
#include "isolate.h"
#include "memory.h"
#include "spaces.h"
#include "v8memory.h"
namespace v8 {
namespace internal {
......
......@@ -30,7 +30,7 @@
#include "cpu.h"
#include "debug.h"
#include "memory.h"
#include "v8memory.h"
namespace v8 {
namespace internal {
......
......@@ -28,8 +28,6 @@
#ifndef V8_X64_FRAMES_X64_H_
#define V8_X64_FRAMES_X64_H_
#include "memory.h"
namespace v8 {
namespace internal {
......
......@@ -457,7 +457,6 @@
'../../src/macro-assembler.h',
'../../src/mark-compact.cc',
'../../src/mark-compact.h',
'../../src/memory.h',
'../../src/messages.cc',
'../../src/messages.h',
'../../src/natives.h',
......@@ -546,6 +545,7 @@
'../../src/v8.h',
'../../src/v8checks.h',
'../../src/v8globals.h',
'../../src/v8memory.h',
'../../src/v8threads.cc',
'../../src/v8threads.h',
'../../src/v8utils.h',
......
......@@ -761,7 +761,7 @@
897FF1580E719B8F00D62E90 /* macro-assembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "macro-assembler.h"; sourceTree = "<group>"; };
897FF1590E719B8F00D62E90 /* mark-compact.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "mark-compact.cc"; sourceTree = "<group>"; };
897FF15A0E719B8F00D62E90 /* mark-compact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mark-compact.h"; sourceTree = "<group>"; };
897FF15B0E719B8F00D62E90 /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
897FF15B0E719B8F00D62E90 /* v8memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8memory.h; sourceTree = "<group>"; };
897FF15C0E719B8F00D62E90 /* messages.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = messages.cc; sourceTree = "<group>"; };
897FF15D0E719B8F00D62E90 /* messages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = messages.h; sourceTree = "<group>"; };
897FF15E0E719B8F00D62E90 /* mksnapshot.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mksnapshot.cc; sourceTree = "<group>"; };
......@@ -1218,7 +1218,7 @@
897FF1580E719B8F00D62E90 /* macro-assembler.h */,
897FF1590E719B8F00D62E90 /* mark-compact.cc */,
897FF15A0E719B8F00D62E90 /* mark-compact.h */,
897FF15B0E719B8F00D62E90 /* memory.h */,
897FF15B0E719B8F00D62E90 /* v8memory.h */,
897FF15C0E719B8F00D62E90 /* messages.cc */,
897FF15D0E719B8F00D62E90 /* messages.h */,
897FF15E0E719B8F00D62E90 /* mksnapshot.cc */,
......
......@@ -781,7 +781,7 @@
>
</File>
<File
RelativePath="..\..\src\memory.h"
RelativePath="..\..\src\v8memory.h"
>
</File>
<File
......
......@@ -765,7 +765,7 @@
>
</File>
<File
RelativePath="..\..\src\memory.h"
RelativePath="..\..\src\v8memory.h"
>
</File>
<File
......
......@@ -782,7 +782,7 @@
>
</File>
<File
RelativePath="..\..\src\memory.h"
RelativePath="..\..\src\v8memory.h"
>
</File>
<File
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment