From aaf9c42782d40360877a2de499eaea5bd7bed9fd Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Tue, 14 Oct 2014 01:48:56 -0700
Subject: [PATCH] C++ build fixes

---
 src/gba/gba-serialize.h |  2 +-
 src/gba/gba.h           | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/gba/gba-serialize.h b/src/gba/gba-serialize.h
index bf1461beb..57ce517cc 100644
--- a/src/gba/gba-serialize.h
+++ b/src/gba/gba-serialize.h
@@ -5,7 +5,7 @@
 
 #include "gba.h"
 
-const uint32_t GBA_SAVESTATE_MAGIC;
+extern const uint32_t GBA_SAVESTATE_MAGIC;
 
 /* Savestate format:
  * 0x00000 - 0x00003: Version Magic (0x01000000)
diff --git a/src/gba/gba.h b/src/gba/gba.h
index 23eb7f13b..2e2e3d39b 100644
--- a/src/gba/gba.h
+++ b/src/gba/gba.h
@@ -66,6 +66,18 @@ struct GBARotationSource;
 struct Patch;
 struct VFile;
 
+struct GBATimer {
+	uint16_t reload;
+	uint16_t oldReload;
+	int32_t lastEvent;
+	int32_t nextEvent;
+	int32_t overflowInterval;
+	unsigned prescaleBits : 4;
+	unsigned countUp : 1;
+	unsigned doIrq : 1;
+	unsigned enable : 1;
+};
+
 struct GBA {
 	struct ARMComponent d;
 
@@ -80,17 +92,7 @@ struct GBA {
 	struct ARMDebugger* debugger;
 
 	int timersEnabled;
-	struct GBATimer {
-		uint16_t reload;
-		uint16_t oldReload;
-		int32_t lastEvent;
-		int32_t nextEvent;
-		int32_t overflowInterval;
-		unsigned prescaleBits : 4;
-		unsigned countUp : 1;
-		unsigned doIrq : 1;
-		unsigned enable : 1;
-	} timers[4];
+	struct GBATimer timers[4];
 
 	int springIRQ;
 	uint32_t biosChecksum;