3 files changed, 17 insertions, 10 deletions
diff --git a/src/actions/actiondef.h b/src/actions/actiondef.h
index c8b57e9e4..10388b1dc 100644
--- a/src/actions/actiondef.h
+++ b/src/actions/actiondef.h
@@ -27,6 +27,13 @@
 #include "input/inputmanager.h"
 
 #define impHandler(name) bool name(InputEvent &event)
+
+#ifdef EATHENA_SUPPORT
+#define impHandlerE(name) bool name(InputEvent &event)
+#else  // EATHENA_SUPPORT
+#define impHandlerE(name) bool name(InputEvent &event A_UNUSED)
+#endif  // EATHENA_SUPPORT
+
 #define impHandler0(name) bool name(InputEvent &event A_UNUSED)
 #define impHandlerVoid(name) bool name(InputEvent &event A_UNUSED) \
     { \
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 4e98517a1..a51dab201 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -1699,7 +1699,7 @@ impHandler0(testInfo)
     return false;
 }
 
-impHandler(craftKey)
+impHandlerE(craftKey)
 {
 #ifdef EATHENA_SUPPORT
     const int slot = (event.action - InputAction::CRAFT_1);
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 5fe0f1b08..b9894aba6 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -896,7 +896,7 @@ impHandler(serverUnIgnoreWhisper)
     return false;
 }
 
-impHandler(setHomunculusName)
+impHandlerE(setHomunculusName)
 {
 #ifdef EATHENA_SUPPORT
     const std::string args = event.args;
@@ -960,7 +960,7 @@ impHandler(warp)
     return false;
 }
 
-impHandler(homunTalk)
+impHandlerE(homunTalk)
 {
 #ifdef EATHENA_SUPPORT
     if (!serverFeatures || !serverFeatures->haveTalkPet())
@@ -978,7 +978,7 @@ impHandler(homunTalk)
     return false;
 }
 
-impHandler(homunEmote)
+impHandlerE(homunEmote)
 {
 #ifdef EATHENA_SUPPORT
     if (!serverFeatures || !serverFeatures->haveTalkPet())
@@ -1000,7 +1000,7 @@ impHandler(homunEmote)
     return false;
 }
 
-impHandler(commandHomunEmote)
+impHandlerE(commandHomunEmote)
 {
 #ifdef EATHENA_SUPPORT
     if (!serverFeatures || !serverFeatures->haveTalkPet())
@@ -1016,7 +1016,7 @@ impHandler(commandHomunEmote)
     return false;
 }
 
-impHandler(createPublicChatRoom)
+impHandlerE(createPublicChatRoom)
 {
 #ifdef EATHENA_SUPPORT
     if (!chatHandler || event.args.empty())
@@ -1028,7 +1028,7 @@ impHandler(createPublicChatRoom)
 #endif
 }
 
-impHandler(joinChatRoom)
+impHandlerE(joinChatRoom)
 {
 #ifdef EATHENA_SUPPORT
     if (!chatHandler)
@@ -1175,7 +1175,7 @@ impHandler(skill)
     return true;
 }
 
-impHandler(craft)
+impHandlerE(craft)
 {
 #ifdef EATHENA_SUPPORT
     const std::string args = event.args;
@@ -1585,7 +1585,7 @@ impHandler(commandGuildRecall)
     return true;
 }
 
-impHandler(mailTo)
+impHandlerE(mailTo)
 {
 #ifdef EATHENA_SUPPORT
     if (!mailWindow)
@@ -1597,7 +1597,7 @@ impHandler(mailTo)
 #endif
 }
 
-impHandler(adoptChild)
+impHandlerE(adoptChild)
 {
 #ifdef EATHENA_SUPPORT
     const std::string nick = getNick(event);