Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts:
	data/Makefile.am

13 files changed, 1 insertions, 79 deletions

diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 53fd4831f..d81e2421a 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 4bd3153e8..f1256e409 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -33,12 +33,6 @@
 
 #include "net/ea/token.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 197ba12b3..9a88b7478 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 6824ee672..ddb381058 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -31,12 +31,6 @@
 
 #include "net/ea/gamehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 9ab8d64b4..e0f29fd1d 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index d8a1cc9e7..d8d291bdd 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
@@ -64,7 +58,7 @@ class GuildHandler : public Ea::GuildHandler, public MessageHandler
 
         void memberList(int guildId);
 
-        void info(int guildId A_UNUSED);
+        void info(int guildId);
 
         void changeMemberPostion(GuildMember *member, int level);
 
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 989ced27a..d924e8713 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -31,12 +31,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 1e73d3c99..c13c882a7 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -33,12 +33,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 624f64cbc..548346205 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -32,12 +32,6 @@
 
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class NpcDialog;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 209ea5047..4d727a986 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -30,12 +30,6 @@
 
 #include "party.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 4fd108e94..bf8e861ff 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h
index 21c1b9026..50bf31c0b 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/specialhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 85c153743..3a4c8c1fc 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {