From 88a00811121f2c636af0de9971d5c6bf5e95edcf Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Sat, 14 Mar 2015 14:40:00 -0700 Subject: [PATCH] Linux: Added support for gcc-4.9.1 Fixed bug with missing quote in #error found by gcc 4.9.1 Signed-off-by: Mark Charlebois --- makefiles/toolchain_native.mk | 4 +++- src/platforms/px4_workqueue.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/makefiles/toolchain_native.mk b/makefiles/toolchain_native.mk index a9598faa39..0d26d95de6 100644 --- a/makefiles/toolchain_native.mk +++ b/makefiles/toolchain_native.mk @@ -62,6 +62,8 @@ CLANGVER= endif endif +USE_GCC=1 + ifeq ($(USE_GCC),1) # GCC Options: CC = gcc @@ -69,7 +71,7 @@ CXX = g++ CPP = gcc -E # GCC Version -DEV_VER_SUPPORTED = 4.6 4.8.2 +DEV_VER_SUPPORTED = 4.6 4.8.2 4.9.1 else # Clang options diff --git a/src/platforms/px4_workqueue.h b/src/platforms/px4_workqueue.h index b482022a60..b6552c204f 100644 --- a/src/platforms/px4_workqueue.h +++ b/src/platforms/px4_workqueue.h @@ -35,8 +35,8 @@ #pragma once -#ifdef __PX4_ROS -#error "Work queue not supported on ROS +#if defined(__PX4_ROS) +#error "Work queue not supported on ROS" #elif defined(__PX4_NUTTX) #include #include