From c1b4ad4ea29ae4837d55decfd662cb6d297b5ab7 Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Mon, 28 Dec 2009 13:48:40 +0000
Subject: [PATCH] Remove unused variable in gbagame addon and sort
 initialization order in firmware class to shut up gcc warnings.

---
 desmume/src/addons/gbagame.cpp | 1 -
 desmume/src/firmware.h         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/desmume/src/addons/gbagame.cpp b/desmume/src/addons/gbagame.cpp
index 457e1d566..e85fe8590 100644
--- a/desmume/src/addons/gbagame.cpp
+++ b/desmume/src/addons/gbagame.cpp
@@ -216,7 +216,6 @@ static u8 gbaReadFlash(u32 adr)
 
 static u8 getSaveTypeGBA(const u8 *data, const u32 size)
 {
-	u8	type = 0;
 	u8	*dat = (u8 *)data;
 	
 	for (u32 i = 0; i < (size / 4); i++)
diff --git a/desmume/src/firmware.h b/desmume/src/firmware.h
index 1345925d8..2db38fe3e 100644
--- a/desmume/src/firmware.h
+++ b/desmume/src/firmware.h
@@ -44,7 +44,7 @@ private:
 	u32		decompress(const u8 *in, u8* &out);
 
 public:
-	CFIRMWARE(): ARM9bootAddr(0), ARM7bootAddr(0), size9(0), size7(0), patched(0) {};
+	CFIRMWARE(): size9(0), size7(0), ARM9bootAddr(0), ARM7bootAddr(0), patched(0) {};
 	
 	bool load();