From e6a7dc7a3ffd4eb988e9039171f1460f656b28c8 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 2 Feb 2015 21:03:19 +0100
Subject: [PATCH] Fixed unit test usage of visibility macros

---
 src/modules/systemlib/err.h | 3 ++-
 unittests/CMakeLists.txt    | 3 +++
 unittests/sbus2_test.cpp    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/systemlib/err.h b/src/modules/systemlib/err.h
index ca13d62655..af90c25600 100644
--- a/src/modules/systemlib/err.h
+++ b/src/modules/systemlib/err.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ *   Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -66,6 +66,7 @@
 #define _SYSTEMLIB_ERR_H
 
 #include <stdarg.h>
+#include "visibility.h"
 
 __BEGIN_DECLS
 
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 666570a71e..3e44f822da 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -23,8 +23,11 @@ include_directories(${CMAKE_SOURCE_DIR})
 include_directories(${PX_SRC})
 include_directories(${PX_SRC}/modules)
 include_directories(${PX_SRC}/lib)
+include_directories(${PX_SRC}/drivers)
 
 add_definitions(-D__EXPORT=)
+add_definitions(-DERROR=-1)
+add_definitions(-DOK=0)
 
 # check
 add_custom_target(unittests COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
diff --git a/unittests/sbus2_test.cpp b/unittests/sbus2_test.cpp
index ee4f3d1d68..15a21c86b7 100644
--- a/unittests/sbus2_test.cpp
+++ b/unittests/sbus2_test.cpp
@@ -11,7 +11,7 @@
 #include "gtest/gtest.h"
 
 TEST(SBUS2Test, SBUS2) {
-	char *filepath = "testdata/sbus2_r7008SB.txt";
+	const char *filepath = "testdata/sbus2_r7008SB.txt";
 
 	FILE *fp;
 	fp = fopen(filepath,"rt");