4 files changed, 9 insertions, 9 deletions
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 3554a9d9e..5440d14d0 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -37,7 +37,7 @@ void AdminHandler::kick(const std::string &name)
     Net::getChatHandler()->talk("@kick " + name);
 }
 
-void AdminHandler::ban(int playerId _UNUSED_)
+void AdminHandler::ban(int playerId A_UNUSED)
 {
     // Not supported
 }
@@ -47,7 +47,7 @@ void AdminHandler::ban(const std::string &name)
     Net::getChatHandler()->talk("@ban " + name);
 }
 
-void AdminHandler::unban(int playerId _UNUSED_)
+void AdminHandler::unban(int playerId A_UNUSED)
 {
     // Not supported
 }
@@ -57,8 +57,8 @@ void AdminHandler::unban(const std::string &name)
     Net::getChatHandler()->talk("@unban " + name);
 }
 
-void AdminHandler::mute(int playerId _UNUSED_, int type _UNUSED_,
-                        int limit _UNUSED_)
+void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
+                        int limit A_UNUSED)
 {
     return; // Still looking into this
 }
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 67b5cdc11..6f77c0e18 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -27,9 +27,9 @@
 #include "net/net.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace Ea
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 2da19ad36..c6606fda8 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -717,7 +717,7 @@ void BeingHandler::processPlayerStop(Net::MessageIn &msg)
     }
 }
 
-void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg _UNUSED_)
+void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg A_UNUSED)
 {
     /*
       * This is an *advisory* message, telling the client that
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index e76cf7840..f3769943d 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -27,9 +27,9 @@
 #include "net/net.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace Ea