summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-24 18:07:19 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-24 18:07:19 +0300
commit9d2eb460fa3569342044b6f3e61d52d86ca8cbb6 (patch)
tree70b9b43072ae67a379fea3693d8671bb75d2a0fa /src/actions
parent30da377919524a96a385cbe16f8ab74d5a4a7fab (diff)
downloadmv-9d2eb460fa3569342044b6f3e61d52d86ca8cbb6.tar.gz
mv-9d2eb460fa3569342044b6f3e61d52d86ca8cbb6.tar.bz2
mv-9d2eb460fa3569342044b6f3e61d52d86ca8cbb6.tar.xz
mv-9d2eb460fa3569342044b6f3e61d52d86ca8cbb6.zip
fix compilation warnings.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/actions.h6
-rw-r--r--src/actions/target.cpp4
2 files changed, 9 insertions, 1 deletions
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
}