diff options
| author | Roman Bapst <romanbapst@yahoo.de> | 2014-09-25 10:25:57 +0200 |
|---|---|---|
| committer | Roman Bapst <romanbapst@yahoo.de> | 2014-09-25 10:25:57 +0200 |
| commit | 6329ca1a70b220b99ea793f416aedc8ab6fbccff (patch) | |
| tree | 5300f14f6bf9e5164a69906406a553b514e69f7e | |
| parent | a69ae3493d99250bd5a46ba1ac5f11fcf2d05069 (diff) | |
| download | px4-firmware-6329ca1a70b220b99ea793f416aedc8ab6fbccff.tar.gz px4-firmware-6329ca1a70b220b99ea793f416aedc8ab6fbccff.tar.bz2 px4-firmware-6329ca1a70b220b99ea793f416aedc8ab6fbccff.zip | |
Adapted so that this header can also be used in a ROS environment
| -rw-r--r-- | src/modules/systemlib/err.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/systemlib/err.h b/src/modules/systemlib/err.h index ca13d6265..2a201ee80 100644 --- a/src/modules/systemlib/err.h +++ b/src/modules/systemlib/err.h @@ -67,6 +67,7 @@ #include <stdarg.h> +#ifdef CONFIG_ARCH_ARM __BEGIN_DECLS __EXPORT const char *getprogname(void); @@ -86,4 +87,8 @@ __EXPORT void vwarnx(const char *fmt, va_list) __attribute__((format(printf, 1, __END_DECLS +#else //we are using ROS (should make a variable!!!) +#include <ros/ros.h> +#define warnx ROS_WARN +#endif #endif |