From 02175f4a678575430a6455e2e5d7f44f6cf64665 Mon Sep 17 00:00:00 2001 From: Roman Bapst Date: Tue, 11 Nov 2014 15:32:20 +0100 Subject: removed unnecessary diff content --- src/lib/ecl/attitude_fw/ecl_roll_controller.h | 1 - src/lib/ecl/attitude_fw/ecl_yaw_controller.h | 1 - src/lib/ecl/ecl.h | 2 +- src/lib/geo/geo.h | 8 ++++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.h b/src/lib/ecl/attitude_fw/ecl_roll_controller.h index dbcabd847..0799dbe03 100644 --- a/src/lib/ecl/attitude_fw/ecl_roll_controller.h +++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.h @@ -53,7 +53,6 @@ #include #include - class __EXPORT ECL_RollController //XXX: create controller superclass { public: diff --git a/src/lib/ecl/attitude_fw/ecl_yaw_controller.h b/src/lib/ecl/attitude_fw/ecl_yaw_controller.h index c9e80930f..a360c14b8 100644 --- a/src/lib/ecl/attitude_fw/ecl_yaw_controller.h +++ b/src/lib/ecl/attitude_fw/ecl_yaw_controller.h @@ -52,7 +52,6 @@ #include #include - class __EXPORT ECL_YawController //XXX: create controller superclass { public: diff --git a/src/lib/ecl/ecl.h b/src/lib/ecl/ecl.h index 662e3a39f..aa3c5000a 100644 --- a/src/lib/ecl/ecl.h +++ b/src/lib/ecl/ecl.h @@ -38,6 +38,6 @@ */ #include + #define ecl_absolute_time hrt_absolute_time #define ecl_elapsed_time hrt_elapsed_time - diff --git a/src/lib/geo/geo.h b/src/lib/geo/geo.h index ff2d92389..fd754a1ae 100644 --- a/src/lib/geo/geo.h +++ b/src/lib/geo/geo.h @@ -45,12 +45,12 @@ #pragma once -#ifdef CONFIG_ARCH_ARM + #include "uORB/topics/fence.h" #include "uORB/topics/vehicle_global_position.h" __BEGIN_DECLS -#endif + #include "geo_lookup/geo_mag_declination.h" #include @@ -278,6 +278,6 @@ __EXPORT float _wrap_360(float bearing); __EXPORT float _wrap_pi(float bearing); __EXPORT float _wrap_2pi(float bearing); -#ifdef CONFIG_ARCH_ARM + __END_DECLS -#endif + -- cgit v1.2.3