From 84726e4a3ad0998ee1dcc8c78d845662fb9a262a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 13 May 2015 18:33:26 +1000 Subject: [PATCH] GCS_MAVLink: use APM_BUILD_DELEGATES --- libraries/GCS_MAVLink/GCS.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS.h b/libraries/GCS_MAVLink/GCS.h index dc00dd2b67..b206ecf16d 100644 --- a/libraries/GCS_MAVLink/GCS.h +++ b/libraries/GCS_MAVLink/GCS.h @@ -70,7 +70,7 @@ class GCS_MAVLINK { public: GCS_MAVLINK(); -#if APM_BUILD_TYPE(APM_BUILD_APMrover2) +#if APM_BUILD_DELEGATES typedef DELEGATE_FUNCTION1(void, AP_HAL::UARTDriver*) run_cli_fn; #else typedef void (*run_cli_fn)(AP_HAL::UARTDriver *); @@ -299,7 +299,7 @@ private: void handle_radio_status(mavlink_message_t *msg, DataFlash_Class &dataflash, bool log_radio); void handle_serial_control(mavlink_message_t *msg, AP_GPS &gps); void lock_channel(mavlink_channel_t chan, bool lock); -#if APM_BUILD_TYPE(APM_BUILD_APMrover2) +#if APM_BUILD_DELEGATES typedef DELEGATE_FUNCTION1(bool, uint8_t) set_mode_fn; #else typedef bool (*set_mode_fn)(uint8_t);