From 3a300575bc408f80e042888f11dd52f4c785edb2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 13 May 2015 18:32:46 +1000 Subject: [PATCH] AP_Menu: use APM_BUILD_DELEGATES --- libraries/AP_Menu/AP_Menu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Menu/AP_Menu.h b/libraries/AP_Menu/AP_Menu.h index 2e362cbb4a..b8c6f24753 100644 --- a/libraries/AP_Menu/AP_Menu.h +++ b/libraries/AP_Menu/AP_Menu.h @@ -56,7 +56,7 @@ public: /// command, so that the same function can be used /// to handle more than one command. /// -#if APM_BUILD_TYPE(APM_BUILD_APMrover2) +#if APM_BUILD_DELEGATES typedef DELEGATE_FUNCTION2(int8_t, uint8_t, const struct arg *) func; #else typedef int8_t (*func)(uint8_t argc, const struct arg *argv); @@ -73,7 +73,7 @@ public: /// /// If this function returns false, the menu exits. /// -#if APM_BUILD_TYPE(APM_BUILD_APMrover2) +#if APM_BUILD_DELEGATES typedef DELEGATE_FUNCTION0(bool) preprompt; #else typedef bool (*preprompt)(void); @@ -98,7 +98,7 @@ public: /// The "?", "help" and "exit" commands are always defined, but /// can be overridden by explicit entries in the command array. /// -#if APM_BUILD_TYPE(APM_BUILD_APMrover2) +#if APM_BUILD_DELEGATES DELEGATE_FUNCTION2(int8_t, uint8_t, const struct arg *) func; #else int8_t (*func)(uint8_t argc, const struct arg *argv);