From 9d2eb460fa3569342044b6f3e61d52d86ca8cbb6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 24 Apr 2015 18:07:19 +0300 Subject: fix compilation warnings. --- src/actions/actions.h | 6 +++++- src/actions/target.cpp | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/actions') diff --git a/src/actions/actions.h b/src/actions/actions.h index 2b32545da..f2407f936 100644 --- a/src/actions/actions.h +++ b/src/actions/actions.h @@ -80,7 +80,11 @@ namespace Actions decHandler(dump); decHandler(serverIgnoreAll); decHandler(serverUnIgnoreAll); - decHandler(error) __attribute__ ((noreturn)); + decHandler(error) +#ifndef ENABLE_CILKPLUS + __attribute__ ((noreturn)) +#endif + ; decHandler(dumpGraphics); decHandler(dumpEnvironment); decHandler(dumpTests); diff --git a/src/actions/target.cpp b/src/actions/target.cpp index 7195f5d0c..b4a2c8058 100644 --- a/src/actions/target.cpp +++ b/src/actions/target.cpp @@ -72,6 +72,8 @@ impHandler0(targetMercenary) { #ifdef EATHENA_SUPPORT return setTarget(ActorType::Mercenary, true); +#else + return false; #endif } @@ -79,6 +81,8 @@ impHandler0(targetPet) { #ifdef EATHENA_SUPPORT return setTarget(ActorType::Pet, true); +#else + return false; #endif } -- cgit v1.2.3-60-g2f50