diff options
| author | Roman Bapst <romanbapst@yahoo.de> | 2014-09-27 12:01:11 +0200 |
|---|---|---|
| committer | Roman Bapst <romanbapst@yahoo.de> | 2014-09-27 12:01:11 +0200 |
| commit | c8b1c5b119e6552e8e5420ca8fecd24b2a3ad4a2 (patch) | |
| tree | 5f0101e997ee6342297e87e9fb64537977c6456e /src/lib | |
| parent | 020a8292155cd2821cb66a9709a8c7c18524bdac (diff) | |
| download | px4-firmware-c8b1c5b119e6552e8e5420ca8fecd24b2a3ad4a2.tar.gz px4-firmware-c8b1c5b119e6552e8e5420ca8fecd24b2a3ad4a2.tar.bz2 px4-firmware-c8b1c5b119e6552e8e5420ca8fecd24b2a3ad4a2.zip | |
Adapted for shared library use with ROS
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/geo/geo.h | 6 | ||||
| -rw-r--r-- | src/lib/geo_lookup/geo_mag_declination.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/geo/geo.h b/src/lib/geo/geo.h index 2311e0a7c..ff2d92389 100644 --- a/src/lib/geo/geo.h +++ b/src/lib/geo/geo.h @@ -45,14 +45,16 @@ #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 <stdbool.h> +#include <stdint.h> #define CONSTANTS_ONE_G 9.80665f /* m/s^2 */ #define CONSTANTS_AIR_DENSITY_SEA_LEVEL_15C 1.225f /* kg/m^3 */ @@ -276,4 +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 diff --git a/src/lib/geo_lookup/geo_mag_declination.h b/src/lib/geo_lookup/geo_mag_declination.h index 0ac062d6d..d79b78412 100644 --- a/src/lib/geo_lookup/geo_mag_declination.h +++ b/src/lib/geo_lookup/geo_mag_declination.h @@ -40,8 +40,12 @@ #pragma once +#ifdef CONFIG_ARCH_ARM __BEGIN_DECLS __EXPORT float get_mag_declination(float lat, float lon); __END_DECLS +#else +float get_mag_declination(float lat, float lon); +#endif |