From 6329ca1a70b220b99ea793f416aedc8ab6fbccff Mon Sep 17 00:00:00 2001
From: Roman Bapst <romanbapst@yahoo.de>
Date: Thu, 25 Sep 2014 10:25:57 +0200
Subject: Adapted so that this header can also be used in a ROS environment

---
 src/modules/systemlib/err.h | 5 +++++
 1 file changed, 5 insertions(+)

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
-- 
cgit v1.2.3