From baccf00674fce24dad6c67aa4a9d9fcc95e0d042 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 27 Nov 2020 20:18:10 +0100
Subject: [PATCH] Remove bogus static function declaration in header

---
 desmume/src/NDSSystem.cpp | 20 ++++++++++----------
 desmume/src/NDSSystem.h   |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp
index c289fcc3e..ee71712a3 100644
--- a/desmume/src/NDSSystem.cpp
+++ b/desmume/src/NDSSystem.cpp
@@ -2630,6 +2630,16 @@ bool NDS_FakeBoot()
 	return true;
 }
 
+static void NDS_CurrentCPUInfoToNDSError(NDSError &ndsError)
+{
+	ndsError.programCounterARM9		= NDS_ARM9.R[15];
+	ndsError.instructionARM9		= NDS_ARM9.instruction;
+	ndsError.instructionAddrARM9	= NDS_ARM9.instruct_adr;
+	ndsError.programCounterARM7		= NDS_ARM7.R[15];
+	ndsError.instructionARM7		= NDS_ARM7.instruction;
+	ndsError.instructionAddrARM7	= NDS_ARM7.instruct_adr;
+}
+
 bool _HACK_DONT_STOPMOVIE = false;
 void NDS_Reset()
 {
@@ -3161,16 +3171,6 @@ NDSError NDS_GetLastError()
 	return _lastNDSError;
 }
 
-static void NDS_CurrentCPUInfoToNDSError(NDSError &ndsError)
-{
-	ndsError.programCounterARM9		= NDS_ARM9.R[15];
-	ndsError.instructionARM9		= NDS_ARM9.instruction;
-	ndsError.instructionAddrARM9	= NDS_ARM9.instruct_adr;
-	ndsError.programCounterARM7		= NDS_ARM7.R[15];
-	ndsError.instructionARM7		= NDS_ARM7.instruction;
-	ndsError.instructionAddrARM7	= NDS_ARM7.instruct_adr;
-}
-
 void emu_halt(EmuHaltReasonCode reasonCode, NDSErrorTag errorTag)
 {
 	switch (reasonCode)
diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h
index da9998da0..8afa017a7 100644
--- a/desmume/src/NDSSystem.h
+++ b/desmume/src/NDSSystem.h
@@ -192,7 +192,6 @@ struct NDS_header
 
 extern void debug();
 NDSError NDS_GetLastError();
-static void NDS_CurrentCPUInfoToNDSError(NDSError &ndsError);
 void emu_halt(EmuHaltReasonCode reasonCode, NDSErrorTag errorTag);
 
 extern u64 nds_timer;