From 35e00f0ba1cc4a0156782d48151c26c502788116 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Wed, 11 Mar 2015 16:59:19 -0700 Subject: [PATCH] Added missing _PX4_IOC substitutions Signed-off-by: Mark Charlebois --- makefiles/linux/config_linux_default.mk | 2 +- src/include/mavlink/mavlink_log.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/makefiles/linux/config_linux_default.mk b/makefiles/linux/config_linux_default.mk index f0575db3f4..a501e67193 100644 --- a/makefiles/linux/config_linux_default.mk +++ b/makefiles/linux/config_linux_default.mk @@ -38,7 +38,7 @@ # Library modules # MODULES += modules/systemlib -#MODULES += modules/systemlib/mixer +MODULES += modules/systemlib/mixer #MODULES += modules/uORB #MODULES += modules/dataman diff --git a/src/include/mavlink/mavlink_log.h b/src/include/mavlink/mavlink_log.h index 4962d029d5..4ba2f98ad5 100644 --- a/src/include/mavlink/mavlink_log.h +++ b/src/include/mavlink/mavlink_log.h @@ -44,6 +44,7 @@ /* * IOCTL interface for sending log messages. */ +#include #include /** @@ -56,9 +57,9 @@ */ #define MAVLINK_LOG_MAXLEN 50 -#define MAVLINK_IOC_SEND_TEXT_INFO _IOC(0x1100, 1) -#define MAVLINK_IOC_SEND_TEXT_CRITICAL _IOC(0x1100, 2) -#define MAVLINK_IOC_SEND_TEXT_EMERGENCY _IOC(0x1100, 3) +#define MAVLINK_IOC_SEND_TEXT_INFO _PX4_IOC(0x1100, 1) +#define MAVLINK_IOC_SEND_TEXT_CRITICAL _PX4_IOC(0x1100, 2) +#define MAVLINK_IOC_SEND_TEXT_EMERGENCY _PX4_IOC(0x1100, 3) #ifdef __cplusplus extern "C" {