diff options
author | 2020-08-30 23:37:12 -0400 | |
---|---|---|
committer | 2020-08-30 23:37:12 -0400 | |
commit | 71bcb539fec9d90572e3170f751746465fd976b4 (patch) | |
tree | e7748c03c32d76dde0418347d27cc1dcbe161d6b | |
parent | 35f708384dc57f32631c6745ec3f76eacda5df45 (diff) |
Remove memarray.h from emu.h
-rw-r--r-- | src/emu/emu.h | 1 | ||||
-rw-r--r-- | src/emu/emupal.h | 1 | ||||
-rw-r--r-- | src/emu/memarray.cpp | 1 | ||||
-rw-r--r-- | src/emu/memarray.h | 4 | ||||
-rw-r--r-- | src/emu/tilemap.h | 1 | ||||
-rw-r--r-- | src/mame/drivers/ngen.cpp | 1 | ||||
-rw-r--r-- | src/mame/video/atarirle.h | 2 | ||||
-rw-r--r-- | src/mame/video/decrmc3.h | 2 |
8 files changed, 8 insertions, 5 deletions
diff --git a/src/emu/emu.h b/src/emu/emu.h index 6e1d90ba82f..af3b6aada72 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -50,7 +50,6 @@ // memory and address spaces #include "emumem.h" -#include "memarray.h" // machine-wide utilities #include "romentry.h" diff --git a/src/emu/emupal.h b/src/emu/emupal.h index 9e6ffb62a9b..73ee3809e90 100644 --- a/src/emu/emupal.h +++ b/src/emu/emupal.h @@ -95,6 +95,7 @@ #pragma once +#include "memarray.h" #include <type_traits> #include <utility> diff --git a/src/emu/memarray.cpp b/src/emu/memarray.cpp index 92069a1f4cb..a5248399924 100644 --- a/src/emu/memarray.cpp +++ b/src/emu/memarray.cpp @@ -9,6 +9,7 @@ ***************************************************************************/ #include "emu.h" +#include "memarray.h" //************************************************************************** diff --git a/src/emu/memarray.h b/src/emu/memarray.h index be44831c9e8..f9a7e406a8e 100644 --- a/src/emu/memarray.h +++ b/src/emu/memarray.h @@ -23,10 +23,6 @@ #pragma once -#ifndef __EMU_H__ -#error Dont include this file directly; include emu.h instead. -#endif - #ifndef MAME_EMU_MEMARRAY_H #define MAME_EMU_MEMARRAY_H diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index a897a5fb80b..504cbfea04a 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -303,6 +303,7 @@ #pragma once +#include "memarray.h" #include <type_traits> #include <utility> #include <vector> diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp index 1510e577a6e..de4ee86a914 100644 --- a/src/mame/drivers/ngen.cpp +++ b/src/mame/drivers/ngen.cpp @@ -77,6 +77,7 @@ #include "machine/wd_fdc.h" #include "machine/z80sio.h" #include "video/mc6845.h" +#include "memarray.h" #include "screen.h" diff --git a/src/mame/video/atarirle.h b/src/mame/video/atarirle.h index 10a27c9268a..4e08ae25cf3 100644 --- a/src/mame/video/atarirle.h +++ b/src/mame/video/atarirle.h @@ -12,6 +12,8 @@ #ifndef MAME_VIDEO_ATARIRLE_H #define MAME_VIDEO_ATARIRLE_H +#include "memarray.h" + //************************************************************************** // CONSTANTS diff --git a/src/mame/video/decrmc3.h b/src/mame/video/decrmc3.h index b7a3d8dc8d0..72f14a0c9c7 100644 --- a/src/mame/video/decrmc3.h +++ b/src/mame/video/decrmc3.h @@ -19,6 +19,8 @@ #pragma once +#include "memarray.h" + //************************************************************************** // TYPE DEFINITIONS |