From 1c33ce61131b099ceca398273a6ef805a47f73c4 Mon Sep 17 00:00:00 2001
From: Nathan Woods <npwoods@mess.org>
Date: Sun, 9 Dec 2012 15:07:19 +0000
Subject: [PATCH] MSVC compilation fixes (nw)

---
 src/mess/drivers/trs80m2.c  | 2 +-
 src/mess/machine/cbmipt.c   | 1 +
 src/mess/machine/lux21046.c | 2 +-
 src/mess/machine/tvc_hbf.c  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mess/drivers/trs80m2.c b/src/mess/drivers/trs80m2.c
index a025384f6b5..7dbe25a322e 100644
--- a/src/mess/drivers/trs80m2.c
+++ b/src/mess/drivers/trs80m2.c
@@ -734,7 +734,7 @@ READ8_MEMBER( trs80m2_state::pio_pa_r )
 	UINT8 data = 0;
 
 	// floppy interrupt
-	data |= m_fdc->intrq_r();
+	data |= (m_fdc->intrq_r() ? 0x01 : 0x00);
 
 	// 2-sided diskette
 	data |= (m_floppy ? m_floppy->twosid_r() : 1) << 1;
diff --git a/src/mess/machine/cbmipt.c b/src/mess/machine/cbmipt.c
index 17e634dbe29..ce8d2197db0 100644
--- a/src/mess/machine/cbmipt.c
+++ b/src/mess/machine/cbmipt.c
@@ -18,6 +18,7 @@
 
 #include "emu.h"
 #include "machine/cbmipt.h"
+#include "machine/c64_neoram.h"
 
 
 /***************************** Commodore 64 ****************************************
diff --git a/src/mess/machine/lux21046.c b/src/mess/machine/lux21046.c
index 0e66a776390..6b905fcc3f8 100644
--- a/src/mess/machine/lux21046.c
+++ b/src/mess/machine/lux21046.c
@@ -216,7 +216,7 @@ WRITE_LINE_MEMBER( luxor_55_21046_device::dma_int_w )
 	m_dma_irq = state;
 
 	// FDC and DMA interrupts are wire-ORed to the Z80
-	m_maincpu->set_input_line(INPUT_LINE_IRQ0, m_fdc_irq | m_dma_irq);
+	m_maincpu->set_input_line(INPUT_LINE_IRQ0, m_fdc_irq || m_dma_irq);
 }
 
 static UINT8 memory_read_byte(address_space &space, offs_t address, UINT8 mem_mask) { return space.read_byte(address); }
diff --git a/src/mess/machine/tvc_hbf.c b/src/mess/machine/tvc_hbf.c
index ccf2a3e0793..918567951c1 100644
--- a/src/mess/machine/tvc_hbf.c
+++ b/src/mess/machine/tvc_hbf.c
@@ -136,7 +136,7 @@ READ8_MEMBER(tvc_hbf_device::io_read)
 		case 0x00:
 			return m_fdc->read(space, offset & 3);
 		case 0x01:
-			return (m_fdc->drq_r()<<7) | m_fdc->intrq_r();
+			return (m_fdc->drq_r()<<7) | (m_fdc->intrq_r() ? 0x01 : 0x00);
 		default:
 			return 0x00;
 	}