From: Frode Solheim <frode@fs-uae.net>
Date: Fri, 15 May 2015 16:01:59 +0000 (+0200)
Subject: moved rethink_cd32fmv to avoid extern / static conflict
X-Git-Tag: 3100~33^2
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=0fade4b3c9069d4e89efb9c220d63583e743ef92;p=francis%2Fwinuae.git

moved rethink_cd32fmv to avoid extern / static conflict
---

diff --git a/cd32_fmv.cpp b/cd32_fmv.cpp
index 8a303775..6538e723 100644
--- a/cd32_fmv.cpp
+++ b/cd32_fmv.cpp
@@ -268,10 +268,6 @@ static uae_u16 mpeg_io_reg;
 static mpeg2dec_t *mpeg_decoder;
 static const mpeg2_info_t *mpeg_info;
 
-extern addrbank fmv_bank;
-extern addrbank fmv_rom_bank;
-extern addrbank fmv_ram_bank;
-
 #if FMV_DEBUG
 static int isdebug(uaecptr addr)
 {
@@ -320,14 +316,6 @@ static bool cl450_checkint(bool enabled)
 	return irq;
 }
 
-void rethink_cd32fmv(void)
-{
-	if (!fmv_ram_bank.baseaddr)
-		return;
-	cl450_checkint(true);
-	l64111_checkint(true);
-}
-
 DECLARE_MEMORY_FUNCTIONS(fmv);
 static addrbank fmv_bank = {
 	fmv_lget, fmv_wget, fmv_bget,
@@ -355,6 +343,14 @@ static addrbank fmv_ram_bank = {
 MEMORY_FUNCTIONS_NOJIT(fmv_rom);
 MEMORY_FUNCTIONS_NOJIT(fmv_ram);
 
+void rethink_cd32fmv(void)
+{
+	if (!fmv_ram_bank.baseaddr)
+		return;
+	cl450_checkint(true);
+	l64111_checkint(true);
+}
+
 #define L64111_FIFO_LOOKUP 96
 #define L64111_FIFO_BYTES 128
 static uae_u8 l64111_fifo[L64111_FIFO_BYTES];