From 55a56ecd6116b90e7eb487e8265920c85e713bf9 Mon Sep 17 00:00:00 2001
From: AJR <ajrhacker@users.noreply.github.com>
Date: Wed, 12 Apr 2017 15:22:24 -0400
Subject: [PATCH] e132xs: Move memory macros out of header file to help prevent
 naming conflicts (nw)

---
 src/devices/cpu/e132xs/e132xs.cpp | 26 ++++++++++++++++++++++++++
 src/devices/cpu/e132xs/e132xs.h   | 25 -------------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp
index b4e1333cbda..f6fef84cf77 100644
--- a/src/devices/cpu/e132xs/e132xs.cpp
+++ b/src/devices/cpu/e132xs/e132xs.cpp
@@ -251,6 +251,32 @@
 #define SAME_SRC_DSTF  (decode)->same_src_dstf
 #define SAME_SRCF_DST  (decode)->same_srcf_dst
 
+
+/* Memory access */
+/* read byte */
+#define READ_B(addr)            m_program->read_byte((addr))
+/* read half-word */
+#define READ_HW(addr)           m_program->read_word((addr) & ~1)
+/* read word */
+#define READ_W(addr)            m_program->read_dword((addr) & ~3)
+
+/* write byte */
+#define WRITE_B(addr, data)     m_program->write_byte(addr, data)
+/* write half-word */
+#define WRITE_HW(addr, data)    m_program->write_word((addr) & ~1, data)
+/* write word */
+#define WRITE_W(addr, data)     m_program->write_dword((addr) & ~3, data)
+
+
+/* I/O access */
+/* read word */
+#define IO_READ_W(addr)         m_io->read_dword(((addr) >> 11) & 0x7ffc)
+/* write word */
+#define IO_WRITE_W(addr, data)  m_io->write_dword(((addr) >> 11) & 0x7ffc, data)
+
+
+#define READ_OP(addr)          m_direct->read_word((addr), m_opcodexor)
+
 //**************************************************************************
 //  INTERNAL ADDRESS MAP
 //**************************************************************************
diff --git a/src/devices/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h
index 5b286eda50c..f28d6a244e8 100644
--- a/src/devices/cpu/e132xs/e132xs.h
+++ b/src/devices/cpu/e132xs/e132xs.h
@@ -176,31 +176,6 @@ enum
 
 extern unsigned dasm_hyperstone(std::ostream &stream, unsigned pc, const uint8_t *oprom, unsigned h_flag, int private_fp);
 
-/* Memory access */
-/* read byte */
-#define READ_B(addr)            m_program->read_byte((addr))
-/* read half-word */
-#define READ_HW(addr)           m_program->read_word((addr) & ~1)
-/* read word */
-#define READ_W(addr)            m_program->read_dword((addr) & ~3)
-
-/* write byte */
-#define WRITE_B(addr, data)     m_program->write_byte(addr, data)
-/* write half-word */
-#define WRITE_HW(addr, data)    m_program->write_word((addr) & ~1, data)
-/* write word */
-#define WRITE_W(addr, data)     m_program->write_dword((addr) & ~3, data)
-
-
-/* I/O access */
-/* read word */
-#define IO_READ_W(addr)         m_io->read_dword(((addr) >> 11) & 0x7ffc)
-/* write word */
-#define IO_WRITE_W(addr, data)  m_io->write_dword(((addr) >> 11) & 0x7ffc, data)
-
-
-#define READ_OP(addr)          m_direct->read_word((addr), m_opcodexor)
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************