aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-11-04 22:52:30 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-11-04 22:52:30 +0100
commit6ecefe7930d851a033b4fa414366dec223560a50 (patch)
tree1dbe329da841bb4801350dc67cff23adc301f624
parent3956a2c836df9aa411815b4a4027fdcfb864f041 (diff)
downloadpx4-firmware-6ecefe7930d851a033b4fa414366dec223560a50.tar.gz
px4-firmware-6ecefe7930d851a033b4fa414366dec223560a50.tar.bz2
px4-firmware-6ecefe7930d851a033b4fa414366dec223560a50.zip
Fix include guards for ROS, needs cleanups
-rw-r--r--include/px4.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/px4.h b/include/px4.h
index 7dedd5f82..abc10276f 100644
--- a/include/px4.h
+++ b/include/px4.h
@@ -37,11 +37,11 @@
* Main system header with common convenience functions
*/
-#ifdef __linux
+#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
#include "ros/ros.h"
#define px4_warnx ROS_WARN
#define px4_infox ROS_INFO
#else
#define px4_warnx warnx
#define px4_infox warnx
-#endif \ No newline at end of file
+#endif