diff options
-rw-r--r-- | scripts/src/emu.lua | 4 | ||||
-rw-r--r-- | src/emu/emu.h | 2 | ||||
-rw-r--r-- | src/emu/emumem.cpp (renamed from src/emu/memory.cpp) | 2 | ||||
-rw-r--r-- | src/emu/emumem.h (renamed from src/emu/memory.h) | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index ca3103422a5..6ca1594f4dc 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -131,6 +131,8 @@ files { MAME_DIR .. "src/emu/emualloc.h", MAME_DIR .. "src/emu/emucore.cpp", MAME_DIR .. "src/emu/emucore.h", + MAME_DIR .. "src/emu/emumem.cpp", + MAME_DIR .. "src/emu/emumem.h", MAME_DIR .. "src/emu/emuopts.cpp", MAME_DIR .. "src/emu/emuopts.h", MAME_DIR .. "src/emu/emupal.cpp", @@ -161,8 +163,6 @@ files { MAME_DIR .. "src/emu/mconfig.h", MAME_DIR .. "src/emu/memarray.cpp", MAME_DIR .. "src/emu/memarray.h", - MAME_DIR .. "src/emu/memory.cpp", - MAME_DIR .. "src/emu/memory.h", MAME_DIR .. "src/emu/network.cpp", MAME_DIR .. "src/emu/network.h", MAME_DIR .. "src/emu/parameters.cpp", diff --git a/src/emu/emu.h b/src/emu/emu.h index e978bbe44d5..07474f871b3 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -41,7 +41,7 @@ #include "devdelegate.h" // memory and address spaces -#include "memory.h" +#include "emumem.h" #include "addrmap.h" #include "memarray.h" diff --git a/src/emu/memory.cpp b/src/emu/emumem.cpp index 92ee2676342..edfd9228492 100644 --- a/src/emu/memory.cpp +++ b/src/emu/emumem.cpp @@ -2,7 +2,7 @@ // copyright-holders:Aaron Giles,Olivier Galibert /*************************************************************************** - memory.c + emumem.c Functions which handle device memory access. diff --git a/src/emu/memory.h b/src/emu/emumem.h index 9fa42b49a93..9348058f650 100644 --- a/src/emu/memory.h +++ b/src/emu/emumem.h @@ -2,7 +2,7 @@ // copyright-holders:Aaron Giles,Olivier Galibert /*************************************************************************** - memory.h + emumem.h Functions which handle device memory accesses. @@ -14,8 +14,8 @@ #error Dont include this file directly; include emu.h instead. #endif -#ifndef __MEMORY_H__ -#define __MEMORY_H__ +#ifndef __EMUMEM_H__ +#define __EMUMEM_H__ @@ -941,4 +941,4 @@ inline UINT64 direct_read_data::read_qword(offs_t byteaddress, offs_t directxor) return m_space.read_qword(byteaddress); } -#endif /* __MEMORY_H__ */ +#endif /* __EMUMEM_H__ */ |