From e855e4454cce0a3bdc51b785a44d7660ae5a921d Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Wed, 7 Jan 2015 00:19:30 +0100 Subject: [PATCH] exclude macro hack for tests target --- src/platforms/px4_defines.h | 2 ++ unittests/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h index 457b5abe37..28eef7e187 100644 --- a/src/platforms/px4_defines.h +++ b/src/platforms/px4_defines.h @@ -177,9 +177,11 @@ typedef param_t px4_param_t; #define PX4_PARAM_GET_BYNAME(_name, _destpt) param_get(param_find(_name), _destpt) /* XXX this is a hack to resolve conflicts with NuttX headers */ +#if !defined(__PX4_TESTS) #define isspace(c) \ ((c) == ' ' || (c) == '\t' || (c) == '\n' || \ (c) == '\r' || (c) == '\f' || c== '\v') +#endif #endif diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index ec3e4104ec..0737f66962 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories(${CMAKE_SOURCE_DIR}/../src/modules) include_directories(${CMAKE_SOURCE_DIR}/../src/lib) add_definitions(-D__EXPORT=) +add_definitions(-D__PX4_TESTS) function(add_gtest) foreach(test_name ${ARGN})